<!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>[13197] trunk: add_settings_error fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13197">13197</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-18 19:43:44 +0000 (Thu, 18 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add_settings_error fixes. Props jeremyclarke. fixes <a href="http://trac.wordpress.org/ticket/11474">#11474</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.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 (13196 => 13197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-02-18 15:40:19 UTC (rev 13196)
+++ trunk/wp-admin/includes/template.php 2010-02-18 19:43:44 UTC (rev 13197)
</span><span class="lines">@@ -3125,11 +3125,11 @@
</span><span class="cx"> * @global array $wp_settings_errors Storage array of errors registered during this pageload
</span><span class="cx"> *
</span><span class="cx"> * @param string $setting Slug title of the setting to which this error applies
</span><del>- * @param string $id Slug-name to identify the error. Used as part of 'id' attribute in HTML output.
</del><ins>+ * @param string $code Slug-name to identify the error. Used as part of 'id' attribute in HTML output.
</ins><span class="cx"> * @param string $message The formatted message text to display to the user (will be shown inside styled <div> and <p>)
</span><span class="cx"> * @param string $type The type of message it is, controls HTML class. Use 'error' or 'updated'.
</span><span class="cx"> */
</span><del>-function add_settings_error( $setting, $id, $message, $type = 'error' ) {
</del><ins>+function add_settings_error( $setting, $code, $message, $type = 'error' ) {
</ins><span class="cx"> global $wp_settings_errors;
</span><span class="cx">
</span><span class="cx"> if ( !isset($wp_settings_errors) )
</span><span class="lines">@@ -3137,7 +3137,7 @@
</span><span class="cx">
</span><span class="cx"> $new_error = array(
</span><span class="cx"> 'setting' => $setting,
</span><del>- 'title' => $title, // @todo $title not defined. Use $id instead?
</del><ins>+ 'code' => $code,
</ins><span class="cx"> 'message' => $message,
</span><span class="cx"> 'type' => $type
</span><span class="cx"> );
</span><span class="lines">@@ -3225,7 +3225,7 @@
</span><span class="cx">
</span><span class="cx"> $output = '';
</span><span class="cx"> foreach ( $settings_errors as $key => $details ) {
</span><del>- $css_id = 'setting-error-' . $details['title'];
</del><ins>+ $css_id = 'setting-error-' . $details['code'];
</ins><span class="cx"> $css_class = $details['type'] . ' fade settings-error';
</span><span class="cx"> $output .= "<div id='$css_id' class='$css_class'> \n";
</span><span class="cx"> $output .= "<p><strong>{$details['message']}</strong></p>";
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (13196 => 13197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-02-18 15:40:19 UTC (rev 13196)
+++ trunk/wp-includes/formatting.php 2010-02-18 19:43:44 UTC (rev 13197)
</span><span class="lines">@@ -2380,9 +2380,9 @@
</span><span class="cx">
</span><span class="cx"> switch ($option) {
</span><span class="cx"> case 'admin_email':
</span><del>- if ( !$value = sanitize_email($value) && function_exists('add_settings_error') )
</del><ins>+ $value = sanitize_email($value);
+ if ( !$value && function_exists('add_settings_error') )
</ins><span class="cx"> add_settings_error('admin_email', 'invalid_admin_email', __('The E-Mail Address submitted was not in the right format. Please enter a valid Email Address'));
</span><del>-
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'thumbnail_size_w':
</span></span></pre>
</div>
</div>
</body>
</html>