<!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>[13785] trunk/wp-admin/options.php:
Simplify the deprecated notice for unregistered settings.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13785">13785</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-21 01:49:00 +0000 (Sun, 21 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify the deprecated notice for unregistered settings. fixes <a href="http://trac.wordpress.org/ticket/11730">#11730</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (13784 => 13785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2010-03-21 01:36:54 UTC (rev 13784)
+++ trunk/wp-admin/options.php 2010-03-21 01:49:00 UTC (rev 13785)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> if ( !isset( $whitelist_options[ $option_page ] ) )
</span><span class="cx"> wp_die( __( 'Error: options page not found.' ) );
</span><span class="cx">
</span><del>- if ( 'options' == $option_page ) {
</del><ins>+ if ( $unregistered = ( 'options' == $option_page ) ) {
</ins><span class="cx"> if ( is_multisite() && ! is_super_admin() )
</span><span class="cx"> wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
</span><span class="cx"> $options = explode( ',', stripslashes( $_POST[ 'page_options' ] ) );
</span><span class="lines">@@ -127,18 +127,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $options ) {
</span><del>- if ( is_array( $whitelist_options[ $option_page ] ) ) {
- $registered = $whitelist_options[ $option_page ];
- $whitelist_check = true;
- } else {
- $whitelist_check = false;
- _deprecated_argument( 'options.php', '2.7', __( 'Unregistered settings are deprecated. Register your theme/plugin settings.' ) );
- }
</del><span class="cx"> foreach ( $options as $option ) {
</span><del>- if ( $whitelist_check && !in_array( $option, $registered ) ) {
- _deprecated_argument( 'options.php', '2.7', __( 'Unregistered settings are deprecated. Register your theme/plugin settings.' ) );
- $whitelist_check = false;
- }
</del><ins>+ if ( $unregistered )
+ _deprecated_argument( 'options.php', '2.7', sprintf( __( 'The "%1$s" setting is unregistered. Unregistered settings are deprecated. See http://codex.wordpress.org/Settings_API' ), $option, $option_page ) );
+
</ins><span class="cx"> $option = trim($option);
</span><span class="cx"> $value = null;
</span><span class="cx"> if ( isset($_POST[$option]) )
</span></span></pre>
</div>
</div>
</body>
</html>