Wordpress 3.3.1 wordpress-3.3.1
authorEdward Z. Yang <ezyang@mit.edu>
Sun, 8 Jan 2012 17:17:56 +0000 (12:17 -0500)
committerEdward Z. Yang <ezyang@mit.edu>
Sun, 8 Jan 2012 17:17:56 +0000 (12:17 -0500)
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
19 files changed:
readme.html
wp-admin/about.php
wp-admin/includes/dashboard.php
wp-admin/includes/ms.php
wp-admin/includes/template.php
wp-admin/includes/update-core.php
wp-admin/js/common.dev.js
wp-admin/js/common.js
wp-admin/load-scripts.php
wp-admin/press-this.php
wp-admin/users.php
wp-includes/capabilities.php
wp-includes/class-wp-admin-bar.php
wp-includes/functions.php
wp-includes/functions.wp-styles.php
wp-includes/nav-menu-template.php
wp-includes/script-loader.php
wp-includes/user.php
wp-includes/version.php

index 72e21ee6f10820c8ffcf44ea5cf5a4d722ddc4b2..66c102f71fbc73c201038955913336a494e1120b 100644 (file)
@@ -8,7 +8,7 @@
 <body>
 <h1 id="logo">
        <a href="http://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" width="250" height="68" /></a>
-       <br /> Version 3.3
+       <br /> Version 3.3.1
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
 
index 21156f0f3af9d82658c7036619c78075f8c04584..470b5579380c508419647a9516ef6d3f4d351385 100644 (file)
@@ -33,6 +33,14 @@ include( './admin-header.php' );
        </a>
 </h2>
 
+<div class="changelog point-releases">
+       <h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 1 ); ?></h3>
+       <p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.', 15 ), '3.3.1', number_format_i18n( 15 ) ); ?>
+               <?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.3.1' ); ?>
+       </p>
+</div>
+
 <div class="changelog">
        <h3><?php _e( 'Easier Uploading' ); ?></h3>
 
index 80be66bd8e66e1175e99b32e61a9d9db5946b5aa..008a4fddb72b80b6e1af7b603ed617bc35985878 100644 (file)
@@ -395,7 +395,7 @@ function wp_dashboard_right_now() {
                $sidebars_widgets = wp_get_sidebars_widgets();
                $num_widgets = 0;
                foreach ( (array) $sidebars_widgets as $k => $v ) {
-                       if ( 'wp_inactive_widgets' == $k )
+                       if ( 'wp_inactive_widgets' == $k || 'orphaned_widgets' == substr( $k, 0, 16 ) )
                                continue;
                        if ( is_array($v) )
                                $num_widgets = $num_widgets + count($v);
index 1b2c7e78e587a6671ff596d1065053bf52704510..2c275dfca301568267454359679a85b9b2275245 100644 (file)
@@ -385,9 +385,11 @@ function get_upload_space_available() {
  */
 function get_space_allowed() {
        $space_allowed = get_option( 'blog_upload_space' );
-       if ( $space_allowed === false )
+
+       if ( ! is_numeric( $space_allowed ) )
                $space_allowed = get_site_option( 'blog_upload_space' );
-       if ( empty( $space_allowed ) || !is_numeric( $space_allowed ) )
+
+       if ( empty( $space_allowed ) || ! is_numeric( $space_allowed ) )
                $space_allowed = 50;
 
        return $space_allowed;
index 010c057d16caaee5d2953ec8c159ee39a2a6ed8f..3d0c1162cd5e63b2dcc557258ca0cd0a2c4ba541 100644 (file)
@@ -334,7 +334,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
        <div id="replycontainer">
        <?php
        $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
-       wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
+       wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings, 'tabindex' => 104 ) );
        ?>
        </div>
 
@@ -1761,11 +1761,11 @@ final class WP_Internal_Pointers {
        }
 
        public static function pointer_wp330_toolbar() {
-               $content  = '<h3>' . esc_js( __( 'New Feature: Toolbar' ) ). '</h3>';
-               $content .= '<p>' . esc_js( __( 'We&#8217;ve combined the admin bar and the old Dashboard header into one persistent toolbar. Hover over the toolbar items to see what&#8217;s new.' ) ) . '</p>';
+               $content  = '<h3>' . __( 'New Feature: Toolbar' ) . '</h3>';
+               $content .= '<p>' .  __( 'We&#8217;ve combined the admin bar and the old Dashboard header into one persistent toolbar. Hover over the toolbar items to see what&#8217;s new.' ) . '</p>';
 
                if ( is_multisite() && is_super_admin() )
-                       $content .= '<p>' .esc_js( __( 'Network Admin is now located in the My Sites menu.' ) ) . '</p>';
+                       $content .= '<p>' . __( 'Network Admin is now located in the My Sites menu.' ) . '</p>';
 
                WP_Internal_Pointers::print_js( 'wp330_toolbar', '#wpadminbar', array(
                        'content'  => $content,
@@ -1779,8 +1779,8 @@ final class WP_Internal_Pointers {
         * @since 3.3.0
         */
        public static function pointer_wp330_media_uploader() {
-               $content  = '<h3>' . esc_js( __( 'Updated Media Uploader' ) ) . '</h3>';
-               $content .= '<p>' . esc_js( __( 'The single media icon now launches the uploader for all file types, and the new drag and drop interface makes uploading a breeze.' ) ) . '</p>';
+               $content  = '<h3>' . __( 'Updated Media Uploader' ) . '</h3>';
+               $content .= '<p>' . __( 'The single media icon now launches the uploader for all file types, and the new drag and drop interface makes uploading a breeze.' ) . '</p>';
 
                WP_Internal_Pointers::print_js( 'wp330_media_uploader', '#content-add_media', array(
                        'content'  => $content,
@@ -1794,8 +1794,8 @@ final class WP_Internal_Pointers {
         * @since 3.3.0
         */
        public static function pointer_wp330_saving_widgets() {
-               $content  = '<h3>' . esc_js( __( 'New Feature: Saving Widgets' ) ) . '</h3>';
-               $content .= '<p>' . esc_js( __( 'If you change your mind and revert to your previous theme, we&#8217;ll put the widgets back the way you had them.' ) ) . '</p>';
+               $content  = '<h3>' . __( 'New Feature: Saving Widgets' ) . '</h3>';
+               $content .= '<p>' . __( 'If you change your mind and revert to your previous theme, we&#8217;ll put the widgets back the way you had them.' ). '</p>';
 
                WP_Internal_Pointers::print_js( 'wp330_saving_widgets', '#message2', array(
                        'content'  => $content,
index bfdb2b09acd1e8303a416c87764fa7d431f40f5d..46979d78b9ede21ee40b3fe925eca0d1643c3803 100644 (file)
@@ -406,7 +406,7 @@ function update_core($from, $to) {
        $mysql_version  = $wpdb->db_version();
        $required_php_version = '5.2.4';
        $required_mysql_version = '5.0';
-       $wp_version = '3.3';
+       $wp_version = '3.3.1';
        $php_compat     = version_compare( $php_version, $required_php_version, '>=' );
        if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
                $mysql_compat = true;
index b8ee100ea118aab34966fb64e41f667ca62b8e40..4918f1f77bda71c06e8cfdeef6d7f8322243a807 100644 (file)
@@ -209,6 +209,7 @@ $(document).ready( function() {
                        else if ( m.css('marginTop') )
                                m.css({'marginTop':''});
 
+                       menu.find('.wp-submenu').removeClass('sub-open');
                        m.addClass('sub-open');
                },
                out: function(){
index d03d5b496440eb72f0170e04aaafbb1ec1cacc23..c812f3fc65e714eae37893f9210e48c99796f6c4 100644 (file)
@@ -1 +1 @@
-var showNotice,adminMenu,columns,validateForm,screenMeta,autofold_menu;(function(a){adminMenu={init:function(){},fold:function(){},restoreMenuState:function(){},toggle:function(){},favorites:function(){}};columns={init:function(){var b=this;a(".hide-column-tog","#adv-settings").click(function(){var d=a(this),c=d.val();if(d.prop("checked")){b.checked(c)}else{b.unchecked(c)}columns.saveManageColumnsState()})},saveManageColumnsState:function(){var b=this.hidden();a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})},checked:function(b){a(".column-"+b).show();this.colSpanChange(+1)},unchecked:function(b){a(".column-"+b).hide();this.colSpanChange(-1)},hidden:function(){return a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",")},useCheckboxesForHidden:function(){this.hidden=function(){return a(".hide-column-tog").not(":checked").map(function(){var b=this.id;return b.substring(b,b.length-5)}).get().join(",")}},colSpanChange:function(b){var d=a("table").find(".colspanchange"),c;if(!d.length){return}c=parseInt(d.attr("colspan"),10)+b;d.attr("colspan",c.toString())}};a(document).ready(function(){columns.init()});validateForm=function(b){return !a(b).find(".form-required").filter(function(){return a("input:visible",this).val()==""}).addClass("form-invalid").find("input:visible").change(function(){a(this).closest(".form-invalid").removeClass("form-invalid")}).size()};showNotice={warn:function(){var b=commonL10n.warnDelete||"";if(confirm(b)){return true}return false},note:function(b){alert(b)}};screenMeta={element:null,toggles:null,page:null,init:function(){this.element=a("#screen-meta");this.toggles=a(".screen-meta-toggle a");this.page=a("#wpcontent");this.toggles.click(this.toggleEvent)},toggleEvent:function(c){var b=a(this.href.replace(/.+#/,"#"));c.preventDefault();if(!b.length){return}if(b.is(":visible")){screenMeta.close(b,a(this))}else{screenMeta.open(b,a(this))}},open:function(b,c){a(".screen-meta-toggle").not(c.parent()).css("visibility","hidden");b.parent().show();b.slideDown("fast",function(){c.addClass("screen-meta-active")})},close:function(b,c){b.slideUp("fast",function(){c.removeClass("screen-meta-active");a(".screen-meta-toggle").css("visibility","");b.parent().hide()})}};a(".contextual-help-tabs").delegate("a","click focus",function(d){var c=a(this),b;d.preventDefault();if(c.is(".active a")){return false}a(".contextual-help-tabs .active").removeClass("active");c.parent("li").addClass("active");b=a(c.attr("href"));a(".help-tab-content").not(b).removeClass("active").hide();b.addClass("active").show()});a(document).ready(function(){var j=false,c,e,k,i,b=a("#adminmenu"),d=a("input.current-page"),f=d.val(),h,g;g=function(l,n){var o=a(n),m=o.attr("tabindex");if(m){o.attr("tabindex","0").attr("tabindex",m)}};a("#collapse-menu",b).click(function(){var l=a(document.body);if(l.hasClass("folded")){l.removeClass("folded");setUserSetting("mfold","o")}else{l.addClass("folded");setUserSetting("mfold","f")}return false});a("li.wp-has-submenu",b).hoverIntent({over:function(t){var u,r,l,s,n=a(this).find(".wp-submenu"),v,p,q;if(!a(document.body).hasClass("folded")&&a(this).hasClass("wp-menu-open")){return}v=a(this).offset().top;p=a(window).scrollTop();q=v-p-30;u=v+n.height()+1;r=a("#wpwrap").height();l=60+u-r;s=a(window).height()+p-15;if(s<(u-l)){l=u-s}if(l>q){l=q}if(l>1){n.css({marginTop:"-"+l+"px"})}else{if(n.css("marginTop")){n.css({marginTop:""})}}n.addClass("sub-open")},out:function(){a(this).find(".wp-submenu").removeClass("sub-open")},timeout:200,sensitivity:7,interval:90});a("li.wp-has-submenu > a.wp-not-current-submenu",b).bind("keydown.adminmenu",function(m){if(m.which!=13){return}var l=a(m.target);m.stopPropagation();m.preventDefault();b.find(".wp-submenu").removeClass("sub-open");l.siblings(".wp-submenu").toggleClass("sub-open").find('a[role="menuitem"]').each(g)}).each(g);a('a[role="menuitem"]',b).bind("keydown.adminmenu",function(m){if(m.which!=27){return}var l=a(m.target);m.stopPropagation();m.preventDefault();l.add(l.siblings()).closest(".sub-open").removeClass("sub-open").siblings("a.wp-not-current-submenu").focus()});a("div.wrap h2:first").nextAll("div.updated, div.error").addClass("below-h2");a("div.updated, div.error").not(".below-h2, .inline").insertAfter(a("div.wrap h2:first"));screenMeta.init();a("tbody").children().children(".check-column").find(":checkbox").click(function(l){if("undefined"==l.shiftKey){return true}if(l.shiftKey){if(!j){return true}c=a(j).closest("form").find(":checkbox");e=c.index(j);k=c.index(this);i=a(this).prop("checked");if(0<e&&0<k&&e!=k){c.slice(e,k).prop("checked",function(){if(a(this).closest("tr").is(":visible")){return i}return false})}}j=this;return true});a("thead, tfoot").find(".check-column :checkbox").click(function(n){var o=a(this).prop("checked"),m="undefined"==typeof toggleWithKeyboard?false:toggleWithKeyboard,l=n.shiftKey||m;a(this).closest("table").children("tbody").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){if(a(this).closest("tr").is(":hidden")){return false}if(l){return a(this).prop("checked")}else{if(o){return true}}return false});a(this).closest("table").children("thead,  tfoot").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){if(l){return false}else{if(o){return true}}return false})});a("#default-password-nag-no").click(function(){setUserSetting("default_password_nag","hide");a("div.default-password-nag").hide();return false});a("#newcontent").bind("keydown.wpevent_InsertTab",function(q){if(q.keyCode!=9){return true}var n=q.target,s=n.selectionStart,m=n.selectionEnd,r=n.value,l,p;try{this.lastKey=9}catch(o){}if(document.selection){n.focus();p=document.selection.createRange();p.text="\t"}else{if(s>=0){l=this.scrollTop;n.value=r.substring(0,s).concat("\t",r.substring(m));n.selectionStart=n.selectionEnd=s+1;this.scrollTop=l}}if(q.stopPropagation){q.stopPropagation()}if(q.preventDefault){q.preventDefault()}});a("#newcontent").bind("blur.wpevent_InsertTab",function(l){if(this.lastKey&&9==this.lastKey){this.focus()}});if(d.length){d.closest("form").submit(function(l){if(a('select[name="action"]').val()==-1&&a('select[name="action2"]').val()==-1&&d.val()==f){d.val("1")}})}a(window).bind("resize.autofold",function(){if(getUserSetting("mfold")=="f"){return}var l=a(window).width();if(l<=800){if(!h){a(document.body).addClass("folded");h=true}}else{if(h){a(document.body).removeClass("folded");h=false}}}).triggerHandler("resize")});a(document).bind("wp_CloseOnEscape",function(c,b){if(typeof(b.cb)!="function"){return}if(typeof(b.condition)!="function"||b.condition()){b.cb()}return true})})(jQuery);
\ No newline at end of file
+var showNotice,adminMenu,columns,validateForm,screenMeta,autofold_menu;(function(a){adminMenu={init:function(){},fold:function(){},restoreMenuState:function(){},toggle:function(){},favorites:function(){}};columns={init:function(){var b=this;a(".hide-column-tog","#adv-settings").click(function(){var d=a(this),c=d.val();if(d.prop("checked")){b.checked(c)}else{b.unchecked(c)}columns.saveManageColumnsState()})},saveManageColumnsState:function(){var b=this.hidden();a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})},checked:function(b){a(".column-"+b).show();this.colSpanChange(+1)},unchecked:function(b){a(".column-"+b).hide();this.colSpanChange(-1)},hidden:function(){return a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",")},useCheckboxesForHidden:function(){this.hidden=function(){return a(".hide-column-tog").not(":checked").map(function(){var b=this.id;return b.substring(b,b.length-5)}).get().join(",")}},colSpanChange:function(b){var d=a("table").find(".colspanchange"),c;if(!d.length){return}c=parseInt(d.attr("colspan"),10)+b;d.attr("colspan",c.toString())}};a(document).ready(function(){columns.init()});validateForm=function(b){return !a(b).find(".form-required").filter(function(){return a("input:visible",this).val()==""}).addClass("form-invalid").find("input:visible").change(function(){a(this).closest(".form-invalid").removeClass("form-invalid")}).size()};showNotice={warn:function(){var b=commonL10n.warnDelete||"";if(confirm(b)){return true}return false},note:function(b){alert(b)}};screenMeta={element:null,toggles:null,page:null,init:function(){this.element=a("#screen-meta");this.toggles=a(".screen-meta-toggle a");this.page=a("#wpcontent");this.toggles.click(this.toggleEvent)},toggleEvent:function(c){var b=a(this.href.replace(/.+#/,"#"));c.preventDefault();if(!b.length){return}if(b.is(":visible")){screenMeta.close(b,a(this))}else{screenMeta.open(b,a(this))}},open:function(b,c){a(".screen-meta-toggle").not(c.parent()).css("visibility","hidden");b.parent().show();b.slideDown("fast",function(){c.addClass("screen-meta-active")})},close:function(b,c){b.slideUp("fast",function(){c.removeClass("screen-meta-active");a(".screen-meta-toggle").css("visibility","");b.parent().hide()})}};a(".contextual-help-tabs").delegate("a","click focus",function(d){var c=a(this),b;d.preventDefault();if(c.is(".active a")){return false}a(".contextual-help-tabs .active").removeClass("active");c.parent("li").addClass("active");b=a(c.attr("href"));a(".help-tab-content").not(b).removeClass("active").hide();b.addClass("active").show()});a(document).ready(function(){var j=false,c,e,k,i,b=a("#adminmenu"),d=a("input.current-page"),f=d.val(),h,g;g=function(l,n){var o=a(n),m=o.attr("tabindex");if(m){o.attr("tabindex","0").attr("tabindex",m)}};a("#collapse-menu",b).click(function(){var l=a(document.body);if(l.hasClass("folded")){l.removeClass("folded");setUserSetting("mfold","o")}else{l.addClass("folded");setUserSetting("mfold","f")}return false});a("li.wp-has-submenu",b).hoverIntent({over:function(t){var u,r,l,s,n=a(this).find(".wp-submenu"),v,p,q;if(!a(document.body).hasClass("folded")&&a(this).hasClass("wp-menu-open")){return}v=a(this).offset().top;p=a(window).scrollTop();q=v-p-30;u=v+n.height()+1;r=a("#wpwrap").height();l=60+u-r;s=a(window).height()+p-15;if(s<(u-l)){l=u-s}if(l>q){l=q}if(l>1){n.css({marginTop:"-"+l+"px"})}else{if(n.css("marginTop")){n.css({marginTop:""})}}b.find(".wp-submenu").removeClass("sub-open");n.addClass("sub-open")},out:function(){a(this).find(".wp-submenu").removeClass("sub-open")},timeout:200,sensitivity:7,interval:90});a("li.wp-has-submenu > a.wp-not-current-submenu",b).bind("keydown.adminmenu",function(m){if(m.which!=13){return}var l=a(m.target);m.stopPropagation();m.preventDefault();b.find(".wp-submenu").removeClass("sub-open");l.siblings(".wp-submenu").toggleClass("sub-open").find('a[role="menuitem"]').each(g)}).each(g);a('a[role="menuitem"]',b).bind("keydown.adminmenu",function(m){if(m.which!=27){return}var l=a(m.target);m.stopPropagation();m.preventDefault();l.add(l.siblings()).closest(".sub-open").removeClass("sub-open").siblings("a.wp-not-current-submenu").focus()});a("div.wrap h2:first").nextAll("div.updated, div.error").addClass("below-h2");a("div.updated, div.error").not(".below-h2, .inline").insertAfter(a("div.wrap h2:first"));screenMeta.init();a("tbody").children().children(".check-column").find(":checkbox").click(function(l){if("undefined"==l.shiftKey){return true}if(l.shiftKey){if(!j){return true}c=a(j).closest("form").find(":checkbox");e=c.index(j);k=c.index(this);i=a(this).prop("checked");if(0<e&&0<k&&e!=k){c.slice(e,k).prop("checked",function(){if(a(this).closest("tr").is(":visible")){return i}return false})}}j=this;return true});a("thead, tfoot").find(".check-column :checkbox").click(function(n){var o=a(this).prop("checked"),m="undefined"==typeof toggleWithKeyboard?false:toggleWithKeyboard,l=n.shiftKey||m;a(this).closest("table").children("tbody").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){if(a(this).closest("tr").is(":hidden")){return false}if(l){return a(this).prop("checked")}else{if(o){return true}}return false});a(this).closest("table").children("thead,  tfoot").filter(":visible").children().children(".check-column").find(":checkbox").prop("checked",function(){if(l){return false}else{if(o){return true}}return false})});a("#default-password-nag-no").click(function(){setUserSetting("default_password_nag","hide");a("div.default-password-nag").hide();return false});a("#newcontent").bind("keydown.wpevent_InsertTab",function(q){if(q.keyCode!=9){return true}var n=q.target,s=n.selectionStart,m=n.selectionEnd,r=n.value,l,p;try{this.lastKey=9}catch(o){}if(document.selection){n.focus();p=document.selection.createRange();p.text="\t"}else{if(s>=0){l=this.scrollTop;n.value=r.substring(0,s).concat("\t",r.substring(m));n.selectionStart=n.selectionEnd=s+1;this.scrollTop=l}}if(q.stopPropagation){q.stopPropagation()}if(q.preventDefault){q.preventDefault()}});a("#newcontent").bind("blur.wpevent_InsertTab",function(l){if(this.lastKey&&9==this.lastKey){this.focus()}});if(d.length){d.closest("form").submit(function(l){if(a('select[name="action"]').val()==-1&&a('select[name="action2"]').val()==-1&&d.val()==f){d.val("1")}})}a(window).bind("resize.autofold",function(){if(getUserSetting("mfold")=="f"){return}var l=a(window).width();if(l<=800){if(!h){a(document.body).addClass("folded");h=true}}else{if(h){a(document.body).removeClass("folded");h=false}}}).triggerHandler("resize")});a(document).bind("wp_CloseOnEscape",function(c,b){if(typeof(b.cb)!="function"){return}if(typeof(b.condition)!="function"||b.condition()){b.cb()}return true})})(jQuery);
\ No newline at end of file
index 95a0c0ccf7a70cc9c2de711b778a15a7c77af202..833677c2d70c1aba0295d569a8a9277d756aebb9 100644 (file)
@@ -92,6 +92,13 @@ function includes_url() {}
  */
 function wp_guess_url() {}
 
+if ( ! function_exists( 'json_encode' ) ) :
+/**
+ * @ignore
+ */
+function json_encode() {}
+endif;
+
 function get_file($path) {
 
        if ( function_exists('realpath') )
index 0c36dbf7de1e9b6bee2666f59d1d3e5f2d2d54fc..f368b213e52c72f5c10630d14b76b4d2b6dc4e64 100644 (file)
@@ -314,6 +314,20 @@ var photostorage = false;
        do_action('admin_print_scripts');
        do_action('admin_head');
 ?>
+       <style type="text/css">
+       #message {
+               margin: 10px 0;
+       }
+       #title,
+       .press-this #wphead {
+               margin-left: 0;
+               margin-right: 0;
+       }
+       .rtl.press-this #header-logo,
+       .rtl.press-this #wphead h1 {
+               float: right;
+       }
+       </style>
        <script type="text/javascript">
        var wpActiveEditor = 'content';
 
@@ -444,7 +458,7 @@ var photostorage = false;
        });
 </script>
 </head>
-<body class="press-this wp-admin">
+<body class="press-this wp-admin<?php if ( is_rtl() ) echo ' rtl'; ?>">
 <form action="press-this.php?action=post" method="post">
 <div id="poststuff" class="metabox-holder">
        <div id="side-sortables" class="press-this-sidebar">
index f124b9ca912e684fd65fe0735982c364c77a86d0..5fefb4276ef3526e90b46d79a908307c27daf3c9 100644 (file)
@@ -100,10 +100,11 @@ case 'promote':
 
                if ( ! current_user_can('promote_user', $id) )
                        wp_die(__('You can&#8217;t edit that user.'));
-               // The new role of the current user must also have the promote_users cap or be a super admin
-               if ( $id == $current_user->ID && ! is_super_admin() && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users') ) {
-                       $update = 'err_admin_role';
-                       continue;
+               // The new role of the current user must also have the promote_users cap or be a multisite super admin
+               if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users')
+                       && ! ( is_multisite() && is_super_admin() ) ) {
+                               $update = 'err_admin_role';
+                               continue;
                }
 
                // If the user doesn't already belong to the blog, bail.
index 5a8224db877dc5877f7451e659a1f81425f23411..19bdaa48a06803a036f9942d2e5128ded42bb2ab 100644 (file)
@@ -487,10 +487,15 @@ class WP_User {
        static function get_data_by( $field, $value ) {
                global $wpdb;
 
-               if ( 'id' == $field )
+               if ( 'id' == $field ) {
+                       // Make sure the value is numeric to avoid casting objects, for example,
+                       // to int 1.
+                       if ( ! is_numeric( $value ) )
+                               return false;
                        $value = absint( $value );
-               else
+               } else {
                        $value = trim( $value );
+               }
 
                if ( !$value )
                        return false;
index 8ee6d1cf207349af36d9737674ae0cdbed77f161..1b8f8b33911ead2aa5bfb242ad21d92c89d9e702 100644 (file)
@@ -196,7 +196,8 @@ class WP_Admin_Bar {
 
        public function render() {
                $root = $this->_bind();
-               $this->_render( $root );
+               if ( $root )
+                       $this->_render( $root );
        }
 
        final protected function _bind() {
index 6b5aa505ca7570ff2c327e9aec7b96e4b6bdb403..521b0dd01c0137dcd36128914c2591a56fe41155 100644 (file)
@@ -2896,6 +2896,13 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
                        -moz-box-sizing: content-box;
                        -webkit-box-sizing: content-box;
                        box-sizing: content-box;
+                       background-color: #f5f5f5;
+                       background-image: -ms-linear-gradient(top, #ffffff, #f2f2f2);
+                       background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+                       background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+                       background-image: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#f2f2f2));
+                       background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+                       background-image: linear-gradient(top, #ffffff, #f2f2f2);
                }
 
                .button:hover {
@@ -2903,13 +2910,15 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
                        border-color: #666;
                }
 
-               .button {
-                       background: #f2f2f2 url(<?php echo wp_guess_url(); ?>/wp-admin/images/white-grad.png) repeat-x scroll left top;
-               }
-
                .button:active {
-                       background: #eee url(<?php echo wp_guess_url(); ?>/wp-admin/images/white-grad-active.png) repeat-x scroll left top;
+                       background-image: -ms-linear-gradient(top, #f2f2f2, #ffffff);
+                       background-image: -moz-linear-gradient(top, #f2f2f2, #ffffff);
+                       background-image: -o-linear-gradient(top, #f2f2f2, #ffffff);
+                       background-image: -webkit-gradient(linear, left top, left bottom, from(#f2f2f2), to(#ffffff));
+                       background-image: -webkit-linear-gradient(top, #f2f2f2, #ffffff);
+                       background-image: linear-gradient(top, #f2f2f2, #ffffff);
                }
+
                <?php if ( 'rtl' == $text_direction ) : ?>
                body { font-family: Tahoma, Arial; }
                <?php endif; ?>
index 8a887e8e0ae395950e2cf7dac5bc0b28a5e263e5..db8b583e98f6a6ce6fb490f4e82e06e014d3abaa 100644 (file)
  * @return bool True on success, false on failure.
  */
 function wp_print_styles( $handles = false ) {
-       do_action( 'wp_print_styles' );
        if ( '' === $handles ) // for wp_head
                $handles = false;
 
+       if ( ! $handles )
+               do_action( 'wp_print_styles' );
+
        global $wp_styles;
        if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
                if ( ! did_action( 'init' ) )
index ad6b5aa9313574eae206fd8762b3bb954b390340..f412c8db4550ae8359204e6da15ea8c15d86c581 100644 (file)
@@ -362,10 +362,11 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
                } elseif ( 'custom' == $menu_item->object ) {
                        $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
                        $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_root_relative_current;
-                       $item_url = untrailingslashit( strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url );
+                       $raw_item_url = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url;
+                       $item_url = untrailingslashit( $raw_item_url );
                        $_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) );
 
-                       if ( in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {
+                       if ( $raw_item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {
                                $classes[] = 'current-menu-item';
                                $menu_items[$key]->current = true;
                                $_anc_id = (int) $menu_item->db_id;
index 47a00fb1f4d14380143ceeae23bffd20e4290dfb..3a2fbf27fb15de3d1698026af0f5fa5ee4de4fc7 100644 (file)
@@ -61,7 +61,7 @@ function wp_default_scripts( &$scripts ) {
 
        $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
 
-       $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20111130', 1 );
+       $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20120102', 1 );
        $scripts->localize( 'common', 'commonL10n', array(
                'warnDelete' => __("You are about to permanently delete the selected items.\n  'Cancel' to stop, 'OK' to delete.")
        ) );
index c4edb184863b65445ba22a96010a613f8cad1945..2b0508fad8dc17be0a2a15fe3ef298571bb0324f 100644 (file)
@@ -696,7 +696,7 @@ function get_blogs_of_user( $user_id, $all = false ) {
        foreach ( $keys as $key ) {
                if ( 'capabilities' !== substr( $key, -12 ) )
                        continue;
-               if ( 0 !== strpos( $key, $wpdb->base_prefix ) )
+               if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) )
                        continue;
                $blog_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
                if ( ! is_numeric( $blog_id ) )
@@ -931,7 +931,7 @@ function setup_userdata($for_user_id = '') {
        else
                $user = new WP_User($for_user_id);
 
-       $userdata   = $user->data;
+       $userdata   = $user;
        $user_ID    = (int) $user->ID;
        $user_level = (int) isset($user->user_level) ? $user->user_level : 0;
 
index 4caf6fce74b21dacb40477452db98c7f54d0fc16..f6d73b902077bdb97c101ce1682b7b894408f75c 100644 (file)
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '3.3';
+$wp_version = '3.3.1';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.