<!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>[13446] trunk/wp-admin: Show a notice when changing a multisite'
 s site admin email.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13446">13446</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-26 21:19:10 +0000 (Fri, 26 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Show a notice when changing a multisite's site admin email. props jorbin. Introduce an .inline class that can be used with div.updated and div.error, to prevent the message from being moved to the top of the page. see <a href="http://trac.wordpress.org/ticket/12192">#12192</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjscommondevjs">trunk/wp-admin/js/common.dev.js</a></li>
<li><a href="#trunkwpadminjscommonjs">trunk/wp-admin/js/common.js</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjscommondevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.dev.js (13445 => 13446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.dev.js        2010-02-26 21:13:24 UTC (rev 13445)
+++ trunk/wp-admin/js/common.dev.js        2010-02-26 21:19:10 UTC (rev 13446)
</span><span class="lines">@@ -172,9 +172,9 @@
</span><span class="cx"> jQuery(document).ready( function($) {
</span><span class="cx">         var lastClicked = false, checks, first, last, checked;
</span><span class="cx"> 
</span><del>-        // Move .updated and .error alert boxes
</del><ins>+        // Move .updated and .error alert boxes. Don't move boxes designed to be inline.
</ins><span class="cx">         $('div.wrap h2:first').nextAll('div.updated, div.error').addClass('below-h2');
</span><del>-        $('div.updated, div.error').not('.below-h2').insertAfter( $('div.wrap h2:first') );
</del><ins>+        $('div.updated, div.error').not('.below-h2, .inline').insertAfter( $('div.wrap h2:first') );
</ins><span class="cx"> 
</span><span class="cx">         // screen settings tab
</span><span class="cx">         $('#show-settings-link').click(function () {
</span></span></pre></div>
<a id="trunkwpadminjscommonjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.js (13445 => 13446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.js        2010-02-26 21:13:24 UTC (rev 13445)
+++ trunk/wp-admin/js/common.js        2010-02-26 21:19:10 UTC (rev 13446)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var showNotice,adminMenu,columns,validateForm;(function(a){adminMenu={init:function(){var b=a(&quot;#adminmenu&quot;);a(&quot;.wp-menu-toggle&quot;,b).each(function(){var c=a(this),d=c.siblings(&quot;.wp-submenu&quot;);if(d.length){c.click(function(){adminMenu.toggle(d)})}else{c.hide()}});this.favorites();a(&quot;.separator&quot;,b).click(function(){if(a(&quot;body&quot;).hasClass(&quot;folded&quot;)){adminMenu.fold(1);deleteUserSetting(&quot;mfold&quot;)}else{adminMenu.fold();setUserSetting(&quot;mfold&quot;,&quot;f&quot;)}return false});if(a(&quot;body&quot;).hasClass(&quot;folded&quot;)){this.fold()}this.restoreMenuState()},restoreMenuState:function(){a(&quot;li.wp-has-submenu&quot;,&quot;#adminmenu&quot;).each(function(c,d){var b=getUserSetting(&quot;m&quot;+c);if(a(d).hasClass(&quot;wp-has-current-submenu&quot;)){return true}if(&quot;o&quot;==b){a(d).addClass(&quot;wp-menu-open&quot;)}else{if(&quot;c&quot;==b){a(d).removeClass(&quot;wp-menu-open&quot;)}}})},toggle:function(b){var c=b.slideToggle(150,function(){b.css(&quot;display&quot;,&quot;&quot;)}).parent().toggleClass(&quot;wp-menu-open&quot;).attr(&quot;id&quot;);if(c){a(&quot;li.wp-has-submenu&quot;,&quot;#adminmenu&quot;).each(function(f,g){if(c==g.id){var d=a(g).hasClass(&quot;wp-menu-open&quot;)?&quot;o&quot;:&quot;c&quot;;setUserSetting(&quot;m&quot;+f,d)}})}return false},fold:function(b){if(b){a(&quot;body&quot;).removeClass(&quot;folded&quot;);a(&quot;#adminmenu li.wp-has-submenu&quot;).unbind()}else{a(&quot;body&quot;).addClass(&quot;folded&quot;);a(&quot;#adminmenu li.wp-has-submenu&quot;).hoverIntent({over:function(j){var d,c,g,k,i;d=a(this).find(&quot;.wp-submenu&quot;);c=a(this).offset().top+d.height()+1;g=a(&quot;#wpwrap&quot;).height();k=60+c-g;i=a(window).height()+a(window).scrollTop()-15;if(i&lt;(c-k)){k=c-i}if(k&gt;1){d.css({marginTop:&quot;-&quot;+k+&quot;px&quot;})}else{if(d.css(&quot;marginTop&quot;)){d.css({marginTop:&quot;&quot;})}}d.addClass(&quot;sub-open&quot;)},out:function(){a(this).find(&quot;.wp-submenu&quot;).removeClass(&quot;sub-open&quot;).css({marginTop:&quot;&quot;})},timeout:220,sensitivity:8,interval:100})}},favorites:function(){a(&quot;#favorite-inside&quot;).width(a(&quot;#favorite-actions&quot;).width()-4);a(&quot;#favorite-toggle, #favorite-inside&quot;).bind(&quot;mouseenter&quot;,function(){a(&quot;#favorite-inside&quot;).removeClass(&quot;slideUp&quot;).addClass(&quot;slideDown&quot;);setTimeout(function(){if(a(&quot;#favorite-inside&quot;).hasClass(&quot;slideDown&quot;)){a(&quot;#favorite-inside&quot;).slideDown(100);a(&quot;#favorite-first&quot;).addClass(&quot;slide-down&quot;)}},200)}).bind(&quot;mouseleave&quot;,function(){a(&quot;#favorite-inside&quot;).removeClass(&quot;slideDown&quot;).addClass(&quot;slideUp&quot;);setTimeout(function(){if(a(&quot;#favorite-inside&quot;).hasClass(&quot;slideUp&quot;)){a(&quot;#favorite-inside&quot;).slideUp(100,function(){a(&quot;#favorite-first&quot;).removeClass(&quot;slide-down&quot;)})}},300)})}};a(document).ready(function(){adminMenu.init()});columns={init:function(){a(&quot;.hide-column-tog&quot;,&quot;#adv-settings&quot;).click(function(){var b=a(this).val();if(a(this).attr(&quot;checked&quot;)){a(&quot;.column-&quot;+b).show()}else{a(&quot;.column-&quot;+b).hide()}columns.save_manage_columns_state()})},save_manage_columns_state:function(){var b=a(&quot;.manage-column&quot;).filter(&quot;:hidden&quot;).map(function(){return this.id}).get().join(&quot;,&quot;);a.post(ajaxurl,{action:&quot;hidden-columns&quot;,hidden:b,screenoptionnonce:a(&quot;#screenoptionnonce&quot;).val(),page:pagenow})}};a(document).ready(function(){columns.init()});validateForm=function(b){return !a(b).find(&quot;.form-required&quot;).filter(function(){return a(&quot;input:visible&quot;,this).val()==&quot;&quot;}).addClass(&quot;form-invalid&quot;).find(&quot;input:visible&quot;).change(function(){a(this).closest(&quot;.form-invalid&quot;).removeClass(&quot;form-invalid&quot;)}).size()}})(jQuery);showNotice={warn:function(){var a=commonL10n.warnDelete||&quot;&quot;;if(confirm(a)){return true}return false},note:function(a){alert(a)}};jQuery(document).ready(function(d){var f=false,a,e,c,b;d(&quot;div.wrap h2:first&quot;).nextAll(&quot;div.updated, div.error&quot;).addClass(&quot;below-h2&quot;);d(&quot;div.updated, div.error&quot;).not(&quot;.below-h2&quot;).insertAfter(d(&quot;div.wrap h2:first&quot;));d(&quot;#show-settings-link&quot;).click(function(){if(!d(&quot;#screen-options-wrap&quot;).hasClass(&quot;screen-options-open&quot;)){d(&quot;#contextual-help-link-wrap&quot;).css(&quot;visibility&quot;,&quot;hidden&quot;)}d(&quot;#screen-options-wrap&quot;).slideToggle(&quot;fast&quot;,function(){if(d(this).hasClass(&quot;screen-options-open&quot;)){d(&quot;#show-settings-link&quot;).css({backgroundImage:'url(&quot;images/screen-options-right.gif&quot;)'});d(&quot;#contextual-help-link-wrap&quot;).css(&quot;visibility&quot;,&quot;&quot;);d(this).removeClass(&quot;screen-options-open&quot;)}else{d(&quot;#show-settings-link&quot;).css({backgroundImage:'url(&quot;images/screen-options-right-up.gif&quot;)'});d(this).addClass(&quot;screen-options-open&quot;)}});return false});d(&quot;#contextual-help-link&quot;).click(function(){if(!d(&quot;#contextual-help-wrap&quot;).hasClass(&quot;contextual-help-open&quot;)){d(&quot;#screen-options-link-wrap&quot;).css(&quot;visibility&quot;,&quot;hidden&quot;)}d(&quot;#contextual-help-wrap&quot;).slideToggle(&quot;fast&quot;,function(){if(d(this).hasClass(&quot;contextual-help-open&quot;)){d(&quot;#contextual-help-link&quot;).css({backgroundImage:'url(&quot;images/screen-options-right.gif&quot;)'});d(&quot;#screen-options-link-wrap&quot;).css(&quot;visibility&quot;,&quot;&quot;);d(this).removeClass(&quot;contextual-help-open&quot;)}else{d(&quot;#contextual-help-link&quot;).css({backgroundImage:'url(&quot;images/screen-options-right-up.gif&quot;)'});d(this).addClass(&quot;contextual-help-open&quot;)}});return false});d(&quot;tbody&quot;).children().children(&quot;.check-column&quot;).find(&quot;:checkbox&quot;).click(function(g){if(&quot;undefined&quot;==g.shiftKey){return true}if(g.shiftKey){if(!f){return true}a=d(f).closest(&quot;form&quot;).find(&quot;:checkbox&quot;);e=a.index(f);c=a.index(this);b=d(this).attr(&quot;checked&quot;);if(0&lt;e&amp;&amp;0&lt;c&amp;&amp;e!=c){a.slice(e,c).attr(&quot;checked&quot;,function(){if(d(this).closest(&quot;tr&quot;).is(&quot;:visible&quot;)){return b?&quot;checked&quot;:&quot;&quot;}return&quot;&quot;})}}f=this;return true});d(&quot;thead, tfoot&quot;).find(&quot;:checkbox&quot;).click(function(i){var j=d(this).attr(&quot;checked&quot;),h=&quot;undefined&quot;==typeof toggleWithKeyboard?false:toggleWithKeyboard,g=i.shiftKey||h;d(this).closest(&quot;table&quot;).children(&quot;tbody&quot;).filter(&quot;:visible&quot;).children().children(&quot;.check-column&quot;).find(&quot;:checkbox&quot;).attr(&quot;checked&quot;,function(){if(d(this).closest(&quot;tr&quot;).is(&quot;:hidden&quot;)){return&quot;&quot;}if(g){return d(this).attr(&quot;checked&quot;)?&quot;&quot;:&quot;checked&quot;}else{if(j){return&quot;checked&quot;}}return&quot;&quot;});d(this).closest(&quot;table&quot;).children(&quot;thead,  tfoot&quot;).filter(&quot;:visible&quot;).children().children(&quot;.check-column&quot;).find(&quot;:checkbox&quot;).attr(&quot;checked&quot;,function(){if(g){return&quot;&quot;}else{if(j){return&quot;checked&quot;}}return&quot;&quot;})});d(&quot;#default-password-nag-no&quot;).click(function(){setUserSetting(&quot;default_password_nag&quot;,&quot;hide&quot;);d(&quot;div.default-password-nag&quot;).hide();return false});d(&quot;textarea#newcontent&quot;).keydown(function(k){if(k.keyCode!=9){return true}var i=k.target,m=i.selectionStart,h=i.selectionEnd,l=i.value,g,j;k.stopPropagation();k.preventDefault();if(document.selection){i.focus();j=document.selection.createRange();j.text=&quot;\t&quot;}else{if(m&gt;=0){g=this.scrollTop;i.value=l.substring(0,m).concat(&quot;\t&quot;,l.substring(h));i.selectionStart=i.selectionEnd=m+1;this.scrollTop=g}}})});jQuery(document).ready(function(b){var a=b(&quot;span.turbo-nag&quot;,&quot;#user_info&quot;);if(!a.length||(&quot;undefined&quot;!=typeof(google)&amp;&amp;google.gears)){return}if(&quot;undefined&quot;!=typeof GearsFactory){return}else{try{if((&quot;undefined&quot;!=typeof window.ActiveXObject&amp;&amp;ActiveXObject(&quot;Gears.Factory&quot;))||(&quot;undefined&quot;!=typeof navigator.mimeTypes&amp;&amp;navigator.mimeTypes[&quot;application/x-googlegears&quot;])){return}}catch(c){}}a.show()});
</del><span class="cx">\ No newline at end of file
</span><ins>+var showNotice,adminMenu,columns,validateForm;(function(a){adminMenu={init:function(){var b=a(&quot;#adminmenu&quot;);a(&quot;.wp-menu-toggle&quot;,b).each(function(){var c=a(this),d=c.siblings(&quot;.wp-submenu&quot;);if(d.length){c.click(function(){adminMenu.toggle(d)})}else{c.hide()}});this.favorites();a(&quot;.separator&quot;,b).click(function(){if(a(&quot;body&quot;).hasClass(&quot;folded&quot;)){adminMenu.fold(1);deleteUserSetting(&quot;mfold&quot;)}else{adminMenu.fold();setUserSetting(&quot;mfold&quot;,&quot;f&quot;)}return false});if(a(&quot;body&quot;).hasClass(&quot;folded&quot;)){this.fold()}this.restoreMenuState()},restoreMenuState:function(){a(&quot;li.wp-has-submenu&quot;,&quot;#adminmenu&quot;).each(function(c,d){var b=getUserSetting(&quot;m&quot;+c);if(a(d).hasClass(&quot;wp-has-current-submenu&quot;)){return true}if(&quot;o&quot;==b){a(d).addClass(&quot;wp-menu-open&quot;)}else{if(&quot;c&quot;==b){a(d).removeClass(&quot;wp-menu-open&quot;)}}})},toggle:function(b){var c=b.slideToggle(150,function(){b.css(&quot;display&quot;,&quot;&quot;)}).parent().toggleClass(&quot;wp-menu-open&quot;).attr(&quot;id&quot;);if(c){a(&quot;li.wp-has-submenu&quot;,&quot;#adminmenu&quot;).each(function(f,g){if(c==g.id){var d=a(g).hasClass(&quot;wp-menu-open&quot;)?&quot;o&quot;:&quot;c&quot;;setUserSetting(&quot;m&quot;+f,d)}})}return false},fold:function(b){if(b){a(&quot;body&quot;).removeClass(&quot;folded&quot;);a(&quot;#adminmenu li.wp-has-submenu&quot;).unbind()}else{a(&quot;body&quot;).addClass(&quot;folded&quot;);a(&quot;#adminmenu li.wp-has-submenu&quot;).hoverIntent({over:function(j){var d,c,g,k,i;d=a(this).find(&quot;.wp-submenu&quot;);c=a(this).offset().top+d.height()+1;g=a(&quot;#wpwrap&quot;).height();k=60+c-g;i=a(window).height()+a(window).scrollTop()-15;if(i&lt;(c-k)){k=c-i}if(k&gt;1){d.css({marginTop:&quot;-&quot;+k+&quot;px&quot;})}else{if(d.css(&quot;marginTop&quot;)){d.css({marginTop:&quot;&quot;})}}d.addClass(&quot;sub-open&quot;)},out:function(){a(this).find(&quot;.wp-submenu&quot;).removeClass(&quot;sub-open&quot;).css({marginTop:&quot;&quot;})},timeout:220,sensitivity:8,interval:100})}},favorites:function(){a(&quot;#favorite-inside&quot;).width(a(&quot;#favorite-actions&quot;).width()-4);a(&quot;#favorite-toggle, #favorite-inside&quot;).bind(&quot;mouseenter&quot;,function(){a(&quot;#favorite-inside&quot;).removeClass(&quot;slideUp&quot;).addClass(&quot;slideDown&quot;);setTimeout(function(){if(a(&quot;#favorite-inside&quot;).hasClass(&quot;slideDown&quot;)){a(&quot;#favorite-inside&quot;).slideDown(100);a(&quot;#favorite-first&quot;).addClass(&quot;slide-down&quot;)}},200)}).bind(&quot;mouseleave&quot;,function(){a(&quot;#favorite-inside&quot;).removeClass(&quot;slideDown&quot;).addClass(&quot;slideUp&quot;);setTimeout(function(){if(a(&quot;#favorite-inside&quot;).hasClass(&quot;slideUp&quot;)){a(&quot;#favorite-inside&quot;).slideUp(100,function(){a(&quot;#favorite-first&quot;).removeClass(&quot;slide-down&quot;)})}},300)})}};a(document).ready(function(){adminMenu.init()});columns={init:function(){a(&quot;.hide-column-tog&quot;,&quot;#adv-settings&quot;).click(function(){var b=a(this).val();if(a(this).attr(&quot;checked&quot;)){a(&quot;.column-&quot;+b).show()}else{a(&quot;.column-&quot;+b).hide()}columns.save_manage_columns_state()})},save_manage_columns_state:function(){var b=a(&quot;.manage-column&quot;).filter(&quot;:hidden&quot;).map(function(){return this.id}).get().join(&quot;,&quot;);a.post(ajaxurl,{action:&quot;hidden-columns&quot;,hidden:b,screenoptionnonce:a(&quot;#screenoptionnonce&quot;).val(),page:pagenow})}};a(document).ready(function(){columns.init()});validateForm=function(b){return !a(b).find(&quot;.form-required&quot;).filter(function(){return a(&quot;input:visible&quot;,this).val()==&quot;&quot;}).addClass(&quot;form-invalid&quot;).find(&quot;input:visible&quot;).change(function(){a(this).closest(&quot;.form-invalid&quot;).removeClass(&quot;form-invalid&quot;)}).size()}})(jQuery);showNotice={warn:function(){var a=commonL10n.warnDelete||&quot;&quot;;if(confirm(a)){return true}return false},note:function(a){alert(a)}};jQuery(document).ready(function(d){var f=false,a,e,c,b;d(&quot;div.wrap h2:first&quot;).nextAll(&quot;div.updated, div.error&quot;).addClass(&quot;below-h2&quot;);d(&quot;div.updated, div.error&quot;).not(&quot;.below-h2, .inline&quot;).insertAfter(d(&quot;div.wrap h2:first&quot;));d(&quot;#show-settings-link&quot;).click(function(){if(!d(&quot;#screen-options-wrap&quot;).hasClass(&quot;screen-options-open&quot;)){d(&quot;#contextual-help-link-wrap&quot;).css(&quot;visibility&quot;,&quot;hidden&quot;)}d(&quot;#screen-options-wrap&quot;).slideToggle(&quot;fast&quot;,function(){if(d(this).hasClass(&quot;screen-options-open&quot;)){d(&quot;#show-settings-link&quot;).css({backgroundImage:'url(&quot;images/screen-options-right.gif&quot;)'});d(&quot;#contextual-help-link-wrap&quot;).css(&quot;visibility&quot;,&quot;&quot;);d(this).removeClass(&quot;screen-options-open&quot;)}else{d(&quot;#show-settings-link&quot;).css({backgroundImage:'url(&quot;images/screen-options-right-up.gif&quot;)'});d(this).addClass(&quot;screen-options-open&quot;)}});return false});d(&quot;#contextual-help-link&quot;).click(function(){if(!d(&quot;#contextual-help-wrap&quot;).hasClass(&quot;contextual-help-open&quot;)){d(&quot;#screen-options-link-wrap&quot;).css(&quot;visibility&quot;,&quot;hidden&quot;)}d(&quot;#contextual-help-wrap&quot;).slideToggle(&quot;fast&quot;,function(){if(d(this).hasClass(&quot;contextual-help-open&quot;)){d(&quot;#contextual-help-link&quot;).css({backgroundImage:'url(&quot;images/screen-options-right.gif&quot;)'});d(&quot;#screen-options-link-wrap&quot;).css(&quot;visibility&quot;,&quot;&quot;);d(this).removeClass(&quot;contextual-help-open&quot;)}else{d(&quot;#contextual-help-link&quot;).css({backgroundImage:'url(&quot;images/screen-options-right-up.gif&quot;)'});d(this).addClass(&quot;contextual-help-open&quot;)}});return false});d(&quot;tbody&quot;).children().children(&quot;.check-column&quot;).find(&quot;:checkbox&quot;).click(function(g){if(&quot;undefined&quot;==g.shiftKey){return true}if(g.shiftKey){if(!f){return true}a=d(f).closest(&quot;form&quot;).find(&quot;:checkbox&quot;);e=a.index(f);c=a.index(this);b=d(this).attr(&quot;checked&quot;);if(0&lt;e&amp;&amp;0&lt;c&amp;&amp;e!=c){a.slice(e,c).attr(&quot;checked&quot;,function(){if(d(this).closest(&quot;tr&quot;).is(&quot;:visible&quot;)){return b?&quot;checked&quot;:&quot;&quot;}return&quot;&quot;})}}f=this;return true});d(&quot;thead, tfoot&quot;).find(&quot;:checkbox&quot;).click(function(i){var j=d(this).attr(&quot;checked&quot;),h=&quot;undefined&quot;==typeof toggleWithKeyboard?false:toggleWithKeyboard,g=i.shiftKey||h;d(this).closest(&quot;table&quot;).children(&quot;tbody&quot;).filter(&quot;:visible&quot;).children().children(&quot;.check-column&quot;).find(&quot;:checkbox&quot;).attr(&quot;checked&quot;,function(){if(d(this).closest(&quot;tr&quot;).is(&quot;:hidden&quot;)){return&quot;&quot;}if(g){return d(this).attr(&quot;checked&quot;)?&quot;&quot;:&quot;checked&quot;}else{if(j){return&quot;checked&quot;}}return&quot;&quot;});d(this).closest(&quot;table&quot;).children(&quot;thead,  tfoot&quot;).filter(&quot;:visible&quot;).children().children(&quot;.check-column&quot;).find(&quot;:checkbox&quot;).attr(&quot;checked&quot;,function(){if(g){return&quot;&quot;}else{if(j){return&quot;checked&quot;}}return&quot;&quot;})});d(&quot;#default-password-nag-no&quot;).click(function(){setUserSetting(&quot;default_password_nag&quot;,&quot;hide&quot;);d(&quot;div.default-password-nag&quot;).hide();return false});d(&quot;textarea#newcontent&quot;).keydown(function(k){if(k.keyCode!=9){return true}var i=k.target,m=i.selectionStart,h=i.selectionEnd,l=i.value,g,j;k.stopPropagation();k.preventDefault();if(document.selection){i.focus();j=document.selection.createRange();j.text=&quot;\t&quot;}else{if(m&gt;=0){g=this.scrollTop;i.value=l.substring(0,m).concat(&quot;\t&quot;,l.substring(h));i.selectionStart=i.selectionEnd=m+1;this.scrollTop=g}}})});jQuery(document).ready(function(b){var a=b(&quot;span.turbo-nag&quot;,&quot;#user_info&quot;);if(!a.length||(&quot;undefined&quot;!=typeof(google)&amp;&amp;google.gears)){return}if(&quot;undefined&quot;!=typeof GearsFactory){return}else{try{if((&quot;undefined&quot;!=typeof window.ActiveXObject&amp;&amp;ActiveXObject(&quot;Gears.Factory&quot;))||(&quot;undefined&quot;!=typeof navigator.mimeTypes&amp;&amp;navigator.mimeTypes[&quot;application/x-googlegears&quot;])){return}}catch(c){}}a.show()});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (13445 => 13446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php        2010-02-26 21:13:24 UTC (rev 13445)
+++ trunk/wp-admin/options-general.php        2010-02-26 21:19:10 UTC (rev 13446)
</span><span class="lines">@@ -104,7 +104,14 @@
</span><span class="cx"> &lt;tr valign=&quot;top&quot;&gt;
</span><span class="cx"> &lt;th scope=&quot;row&quot;&gt;&lt;label for=&quot;new_admin_email&quot;&gt;&lt;?php _e('E-mail address') ?&gt; &lt;/label&gt;&lt;/th&gt;
</span><span class="cx"> &lt;td&gt;&lt;input name=&quot;new_admin_email&quot; type=&quot;text&quot; id=&quot;new_admin_email&quot; value=&quot;&lt;?php form_option('admin_email'); ?&gt;&quot; class=&quot;regular-text code&quot; /&gt;
</span><del>-&lt;span class=&quot;setting-description&quot;&gt;&lt;?php _e('This address is used for admin purposes.') ?&gt; &lt;?php _e('If you change this we will send you an email at your new address to confirm it. &lt;strong&gt;The new address will not become active until confirmed.&lt;/strong&gt;') ?&gt;&lt;/span&gt;&lt;/td&gt;
</del><ins>+&lt;span class=&quot;setting-description&quot;&gt;&lt;?php _e('This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. &lt;strong&gt;The new address will not become active until confirmed.&lt;/strong&gt;') ?&gt;&lt;/span&gt;
+&lt;?php
+if ( $new_admin_email = get_option( 'new_admin_email' ) ) : ?&gt;
+&lt;div class=&quot;updated inline&quot;&gt;
+&lt;p&gt;&lt;?php printf( __('There is a pending change of the admin e-mail to &lt;code&gt;%s&lt;/code&gt;.'), $new_admin_email ); ?&gt;&lt;/p&gt;
+&lt;/div&gt;
+&lt;?php endif; ?&gt;
+&lt;/td&gt;
</ins><span class="cx"> &lt;/tr&gt;
</span><span class="cx"> &lt;?php } ?&gt;
</span><span class="cx"> &lt;tr&gt;
</span></span></pre>
</div>
</div>

</body>
</html>