diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/readme.html ./wordpress-3.3.1/readme.html
*** ./wordpress-3.3/readme.html	2011-10-10 18:50:20.000000000 -0500
--- ./wordpress-3.3.1/readme.html	2012-01-03 11:01:50.000000000 -0600
***************
*** 8,14 ****
  <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
  </h1>
  <p style="text-align: center">Semantic Personal Publishing Platform</p>
  
--- 8,14 ----
  <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.1
  </h1>
  <p style="text-align: center">Semantic Personal Publishing Platform</p>
  
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-admin/about.php ./wordpress-3.3.1/wp-admin/about.php
*** ./wordpress-3.3/wp-admin/about.php	2011-12-02 11:17:08.000000000 -0600
--- ./wordpress-3.3.1/wp-admin/about.php	2012-01-03 14:45:03.000000000 -0600
***************
*** 33,38 ****
--- 33,46 ----
  	</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>
  
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-admin/includes/dashboard.php ./wordpress-3.3.1/wp-admin/includes/dashboard.php
*** ./wordpress-3.3/wp-admin/includes/dashboard.php	2011-12-02 14:48:47.000000000 -0600
--- ./wordpress-3.3.1/wp-admin/includes/dashboard.php	2012-01-03 12:31:52.000000000 -0600
***************
*** 395,401 ****
  		$sidebars_widgets = wp_get_sidebars_widgets();
  		$num_widgets = 0;
  		foreach ( (array) $sidebars_widgets as $k => $v ) {
! 			if ( 'wp_inactive_widgets' == $k )
  				continue;
  			if ( is_array($v) )
  				$num_widgets = $num_widgets + count($v);
--- 395,401 ----
  		$sidebars_widgets = wp_get_sidebars_widgets();
  		$num_widgets = 0;
  		foreach ( (array) $sidebars_widgets as $k => $v ) {
! 			if ( 'wp_inactive_widgets' == $k || 'orphaned_widgets' == substr( $k, 0, 16 ) )
  				continue;
  			if ( is_array($v) )
  				$num_widgets = $num_widgets + count($v);
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-admin/includes/ms.php ./wordpress-3.3.1/wp-admin/includes/ms.php
*** ./wordpress-3.3/wp-admin/includes/ms.php	2011-11-16 16:02:01.000000000 -0600
--- ./wordpress-3.3.1/wp-admin/includes/ms.php	2012-01-03 11:54:50.000000000 -0600
***************
*** 385,393 ****
   */
  function get_space_allowed() {
  	$space_allowed = get_option( 'blog_upload_space' );
! 	if ( $space_allowed === false )
  		$space_allowed = get_site_option( 'blog_upload_space' );
! 	if ( empty( $space_allowed ) || !is_numeric( $space_allowed ) )
  		$space_allowed = 50;
  
  	return $space_allowed;
--- 385,395 ----
   */
  function get_space_allowed() {
  	$space_allowed = get_option( 'blog_upload_space' );
! 
! 	if ( ! is_numeric( $space_allowed ) )
  		$space_allowed = get_site_option( 'blog_upload_space' );
! 
! 	if ( empty( $space_allowed ) || ! is_numeric( $space_allowed ) )
  		$space_allowed = 50;
  
  	return $space_allowed;
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-admin/includes/template.php ./wordpress-3.3.1/wp-admin/includes/template.php
*** ./wordpress-3.3/wp-admin/includes/template.php	2011-12-08 15:55:39.000000000 -0600
--- ./wordpress-3.3.1/wp-admin/includes/template.php	2012-01-03 14:29:17.000000000 -0600
***************
*** 334,340 ****
  	<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 ) );
  	?>
  	</div>
  
--- 334,340 ----
  	<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, 'tabindex' => 104 ) );
  	?>
  	</div>
  
***************
*** 1761,1771 ****
  	}
  
  	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>';
  
  		if ( is_multisite() && is_super_admin() )
! 			$content .= '<p>' .esc_js( __( 'Network Admin is now located in the My Sites menu.' ) ) . '</p>';
  
  		WP_Internal_Pointers::print_js( 'wp330_toolbar', '#wpadminbar', array(
  			'content'  => $content,
--- 1761,1771 ----
  	}
  
  	public static function pointer_wp330_toolbar() {
! 		$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>' . __( 'Network Admin is now located in the My Sites menu.' ) . '</p>';
  
  		WP_Internal_Pointers::print_js( 'wp330_toolbar', '#wpadminbar', array(
  			'content'  => $content,
***************
*** 1779,1786 ****
  	 * @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>';
  
  		WP_Internal_Pointers::print_js( 'wp330_media_uploader', '#content-add_media', array(
  			'content'  => $content,
--- 1779,1786 ----
  	 * @since 3.3.0
  	 */
  	public static function pointer_wp330_media_uploader() {
! 		$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,1801 ****
  	 * @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>';
  
  		WP_Internal_Pointers::print_js( 'wp330_saving_widgets', '#message2', array(
  			'content'  => $content,
--- 1794,1801 ----
  	 * @since 3.3.0
  	 */
  	public static function pointer_wp330_saving_widgets() {
! 		$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,
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-admin/includes/update-core.php ./wordpress-3.3.1/wp-admin/includes/update-core.php
*** ./wordpress-3.3/wp-admin/includes/update-core.php	2011-12-12 14:24:19.000000000 -0600
--- ./wordpress-3.3.1/wp-admin/includes/update-core.php	2012-01-03 11:01:50.000000000 -0600
***************
*** 406,412 ****
  	$mysql_version  = $wpdb->db_version();
  	$required_php_version = '5.2.4';
  	$required_mysql_version = '5.0';
! 	$wp_version = '3.3';
  	$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
  	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
  		$mysql_compat = true;
--- 406,412 ----
  	$mysql_version  = $wpdb->db_version();
  	$required_php_version = '5.2.4';
  	$required_mysql_version = '5.0';
! 	$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;
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-admin/js/common.dev.js ./wordpress-3.3.1/wp-admin/js/common.dev.js
*** ./wordpress-3.3/wp-admin/js/common.dev.js	2011-11-30 22:51:35.000000000 -0600
--- ./wordpress-3.3.1/wp-admin/js/common.dev.js	2012-01-02 15:51:35.000000000 -0600
***************
*** 209,214 ****
--- 209,215 ----
  			else if ( m.css('marginTop') )
  				m.css({'marginTop':''});
  
+ 			menu.find('.wp-submenu').removeClass('sub-open');
  			m.addClass('sub-open');
  		},
  		out: function(){
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-admin/js/common.js ./wordpress-3.3.1/wp-admin/js/common.js
*** ./wordpress-3.3/wp-admin/js/common.js	2011-11-30 18:43:18.000000000 -0600
--- ./wordpress-3.3.1/wp-admin/js/common.js	2012-01-02 15:51:35.000000000 -0600
***************
*** 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
--- 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:""})}}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
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-admin/load-scripts.php ./wordpress-3.3.1/wp-admin/load-scripts.php
*** ./wordpress-3.3/wp-admin/load-scripts.php	2011-04-11 13:55:11.000000000 -0500
--- ./wordpress-3.3.1/wp-admin/load-scripts.php	2011-12-30 17:01:16.000000000 -0600
***************
*** 92,97 ****
--- 92,104 ----
   */
  function wp_guess_url() {}
  
+ if ( ! function_exists( 'json_encode' ) ) :
+ /**
+  * @ignore
+  */
+ function json_encode() {}
+ endif;
+ 
  function get_file($path) {
  
  	if ( function_exists('realpath') )
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-admin/press-this.php ./wordpress-3.3.1/wp-admin/press-this.php
*** ./wordpress-3.3/wp-admin/press-this.php	2011-11-23 14:32:21.000000000 -0600
--- ./wordpress-3.3.1/wp-admin/press-this.php	2012-01-03 14:44:01.000000000 -0600
***************
*** 314,319 ****
--- 314,333 ----
  	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,450 ****
  	});
  </script>
  </head>
! <body class="press-this wp-admin">
  <form action="press-this.php?action=post" method="post">
  <div id="poststuff" class="metabox-holder">
  	<div id="side-sortables" class="press-this-sidebar">
--- 458,464 ----
  	});
  </script>
  </head>
! <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">
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-admin/users.php ./wordpress-3.3.1/wp-admin/users.php
*** ./wordpress-3.3/wp-admin/users.php	2011-11-30 22:51:35.000000000 -0600
--- ./wordpress-3.3.1/wp-admin/users.php	2012-01-02 15:45:38.000000000 -0600
***************
*** 100,109 ****
  
  		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;
  		}
  
  		// If the user doesn't already belong to the blog, bail.
--- 100,110 ----
  
  		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 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.
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-includes/capabilities.php ./wordpress-3.3.1/wp-includes/capabilities.php
*** ./wordpress-3.3/wp-includes/capabilities.php	2011-11-17 14:40:24.000000000 -0600
--- ./wordpress-3.3.1/wp-includes/capabilities.php	2012-01-03 14:44:01.000000000 -0600
***************
*** 487,496 ****
  	static function get_data_by( $field, $value ) {
  		global $wpdb;
  
! 		if ( 'id' == $field )
  			$value = absint( $value );
! 		else
  			$value = trim( $value );
  
  		if ( !$value )
  			return false;
--- 487,501 ----
  	static function get_data_by( $field, $value ) {
  		global $wpdb;
  
! 		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 {
  			$value = trim( $value );
+ 		}
  
  		if ( !$value )
  			return false;
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-includes/class-wp-admin-bar.php ./wordpress-3.3.1/wp-includes/class-wp-admin-bar.php
*** ./wordpress-3.3/wp-includes/class-wp-admin-bar.php	2011-12-05 21:51:58.000000000 -0600
--- ./wordpress-3.3.1/wp-includes/class-wp-admin-bar.php	2012-01-02 15:37:16.000000000 -0600
***************
*** 196,202 ****
  
  	public function render() {
  		$root = $this->_bind();
! 		$this->_render( $root );
  	}
  
  	final protected function _bind() {
--- 196,203 ----
  
  	public function render() {
  		$root = $this->_bind();
! 		if ( $root )
! 			$this->_render( $root );
  	}
  
  	final protected function _bind() {
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-includes/functions.php ./wordpress-3.3.1/wp-includes/functions.php
*** ./wordpress-3.3/wp-includes/functions.php	2011-11-23 11:29:49.000000000 -0600
--- ./wordpress-3.3.1/wp-includes/functions.php	2011-12-30 16:29:47.000000000 -0600
***************
*** 2896,2901 ****
--- 2896,2908 ----
  			-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,2915 ****
  			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;
  		}
  		<?php if ( 'rtl' == $text_direction ) : ?>
  		body { font-family: Tahoma, Arial; }
  		<?php endif; ?>
--- 2910,2924 ----
  			border-color: #666;
  		}
  
  		.button:active {
! 			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; ?>
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-includes/functions.wp-styles.php ./wordpress-3.3.1/wp-includes/functions.wp-styles.php
*** ./wordpress-3.3/wp-includes/functions.wp-styles.php	2011-10-24 14:13:23.000000000 -0500
--- ./wordpress-3.3.1/wp-includes/functions.wp-styles.php	2012-01-02 16:34:31.000000000 -0600
***************
*** 18,27 ****
   * @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;
  
  	global $wp_styles;
  	if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
  		if ( ! did_action( 'init' ) )
--- 18,29 ----
   * @return bool True on success, false on failure.
   */
  function wp_print_styles( $handles = false ) {
  	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' ) )
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-includes/nav-menu-template.php ./wordpress-3.3.1/wp-includes/nav-menu-template.php
*** ./wordpress-3.3/wp-includes/nav-menu-template.php	2011-09-21 21:25:57.000000000 -0500
--- ./wordpress-3.3.1/wp-includes/nav-menu-template.php	2012-01-03 12:27:59.000000000 -0600
***************
*** 362,371 ****
  		} 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 );
  			$_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) );
  
! 			if ( 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;
--- 362,372 ----
  		} elseif ( 'custom' == $menu_item->object ) {
  			$_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
  			$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_root_relative_current;
! 			$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 ( $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;
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-includes/script-loader.php ./wordpress-3.3.1/wp-includes/script-loader.php
*** ./wordpress-3.3/wp-includes/script-loader.php	2011-12-09 13:20:47.000000000 -0600
--- ./wordpress-3.3.1/wp-includes/script-loader.php	2012-01-02 15:51:35.000000000 -0600
***************
*** 61,67 ****
  
  	$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->localize( 'common', 'commonL10n', array(
  		'warnDelete' => __("You are about to permanently delete the selected items.\n  'Cancel' to stop, 'OK' to delete.")
  	) );
--- 61,67 ----
  
  	$scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
  
! 	$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.")
  	) );
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-includes/user.php ./wordpress-3.3.1/wp-includes/user.php
*** ./wordpress-3.3/wp-includes/user.php	2011-11-07 17:07:07.000000000 -0600
--- ./wordpress-3.3.1/wp-includes/user.php	2012-01-02 15:31:27.000000000 -0600
***************
*** 696,702 ****
  	foreach ( $keys as $key ) {
  		if ( 'capabilities' !== substr( $key, -12 ) )
  			continue;
! 		if ( 0 !== strpos( $key, $wpdb->base_prefix ) )
  			continue;
  		$blog_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
  		if ( ! is_numeric( $blog_id ) )
--- 696,702 ----
  	foreach ( $keys as $key ) {
  		if ( 'capabilities' !== substr( $key, -12 ) )
  			continue;
! 		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,937 ****
  	else
  		$user = new WP_User($for_user_id);
  
! 	$userdata   = $user->data;
  	$user_ID    = (int) $user->ID;
  	$user_level = (int) isset($user->user_level) ? $user->user_level : 0;
  
--- 931,937 ----
  	else
  		$user = new WP_User($for_user_id);
  
! 	$userdata   = $user;
  	$user_ID    = (int) $user->ID;
  	$user_level = (int) isset($user->user_level) ? $user->user_level : 0;
  
diff -crBPN --exclude=.htaccess.inst --exclude=wp-config.php --exclude=wordpress.sql --exclude=wp-config.php --exclude=wordpress.sql --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.3.1.pl ./wordpress-3.3/wp-includes/version.php ./wordpress-3.3.1/wp-includes/version.php
*** ./wordpress-3.3/wp-includes/version.php	2011-12-12 16:20:00.000000000 -0600
--- ./wordpress-3.3.1/wp-includes/version.php	2012-01-03 14:35:03.000000000 -0600
***************
*** 4,10 ****
   *
   * @global string $wp_version
   */
! $wp_version = '3.3';
  
  /**
   * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
--- 4,10 ----
   *
   * @global string $wp_version
   */
! $wp_version = '3.3.1';
  
  /**
   * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
