X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/ff81ee6e8304a1982a3ec4f5b134764a29d502cf..refs/tags/wordpress-3.3.1-scripts:/wp-admin/options-head.php

diff --git a/wp-admin/options-head.php b/wp-admin/options-head.php
index 579da0a3..7f2cc74d 100644
--- a/wp-admin/options-head.php
+++ b/wp-admin/options-head.php
@@ -1,24 +1,21 @@
 <?php
+/**
+ * WordPress Options Header.
+ *
+ * Resets variables: 'action', 'standalone', and 'option_group_id'. Displays
+ * updated message, if updated variable is part of the URL query.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
 
-$wpvarstoreset = array('action','standalone', 'option_group_id');
-for ($i=0; $i<count($wpvarstoreset); $i += 1) {
-	$wpvar = $wpvarstoreset[$i];
-	if (!isset($$wpvar)) {
-		if (empty($_POST["$wpvar"])) {
-			if (empty($_GET["$wpvar"])) {
-				$$wpvar = '';
-			} else {
-				$$wpvar = $_GET["$wpvar"];
-			}
-		} else {
-			$$wpvar = $_POST["$wpvar"];
-		}
-	}
+wp_reset_vars(array('action', 'standalone', 'option_group_id'));
+
+if ( isset( $_GET['updated'] ) && isset( $_GET['page'] ) ) {
+	// For backwards compat with plugins that don't use the Settings API and just set updated=1 in the redirect
+	add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
 }
-?>
 
-<br clear="all" />
+settings_errors();
 
-<?php if (isset($_GET['updated'])) : ?>
-<div id="message" class="updated fade"><p><strong><?php _e('Options saved.') ?></strong></p></div>
-<?php endif; ?>
\ No newline at end of file
+?>
\ No newline at end of file