<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16706] trunk/wp-admin: Backwards compat for plugin use of updated=1.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16706">16706</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-12-03 10:59:20 +0000 (Fri, 03 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Backwards compat for plugin use of updated=1. fixes <a href="http://trac.wordpress.org/ticket/15660">#15660</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminoptionsheadphp">trunk/wp-admin/options-head.php</a></li>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (16705 => 16706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-12-03 10:13:17 UTC (rev 16705)
+++ trunk/wp-admin/includes/template.php 2010-12-03 10:59:20 UTC (rev 16706)
</span><span class="lines">@@ -1238,7 +1238,7 @@
</span><span class="cx"> * Checks the $wp_settings_errors array for any errors declared during the current
</span><span class="cx"> * pageload and returns them.
</span><span class="cx"> *
</span><del>- * If changes were just submitted ($_GET['updated']) and settings errors were saved
</del><ins>+ * If changes were just submitted ($_GET['settings-updated']) and settings errors were saved
</ins><span class="cx"> * to the 'settings_errors' transient then those errors will be returned instead. This
</span><span class="cx"> * is used to pass errors back across pageloads.
</span><span class="cx"> *
</span><span class="lines">@@ -1265,7 +1265,7 @@
</span><span class="cx">
</span><span class="cx"> // If settings were passed back from options.php then use them
</span><span class="cx"> // Ignore transients if $sanitize is true, we dont' want the old values anyway
</span><del>- if ( isset($_GET['updated']) && $_GET['updated'] && get_transient('settings_errors') ) {
</del><ins>+ if ( isset($_GET['settings-updated']) && $_GET['settings-updated'] && get_transient('settings_errors') ) {
</ins><span class="cx"> $settings_errors = get_transient('settings_errors');
</span><span class="cx"> delete_transient('settings_errors');
</span><span class="cx"> // Otherwise check global in case validation has been run on this pageload
</span><span class="lines">@@ -1308,7 +1308,7 @@
</span><span class="cx"> */
</span><span class="cx"> function settings_errors( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
</span><span class="cx">
</span><del>- if ($hide_on_update AND $_GET['updated']) return;
</del><ins>+ if ($hide_on_update AND $_GET['settings-updated']) return;
</ins><span class="cx">
</span><span class="cx"> $settings_errors = get_settings_errors( $setting, $sanitize );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminoptionsheadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-head.php (16705 => 16706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-head.php 2010-12-03 10:13:17 UTC (rev 16705)
+++ trunk/wp-admin/options-head.php 2010-12-03 10:59:20 UTC (rev 16706)
</span><span class="lines">@@ -11,6 +11,11 @@
</span><span class="cx">
</span><span class="cx"> wp_reset_vars(array('action', 'standalone', 'option_group_id'));
</span><span class="cx">
</span><ins>+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');
+}
+
</ins><span class="cx"> settings_errors();
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (16705 => 16706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2010-12-03 10:13:17 UTC (rev 16705)
+++ trunk/wp-admin/options.php 2010-12-03 10:59:20 UTC (rev 16706)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Redirect back to the settings page that was submitted
</span><span class="cx"> */
</span><del>- $goback = add_query_arg( 'updated', 'true', wp_get_referer() );
</del><ins>+ $goback = add_query_arg( 'settings-updated', 'true', wp_get_referer() );
</ins><span class="cx"> wp_redirect( $goback );
</span><span class="cx"> exit;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>