Index: wp-includes/user.php
===================================================================
--- wp-includes/user.php	(revision 13532)
+++ wp-includes/user.php	(working copy)
@@ -203,7 +203,6 @@
 	if ( !empty( $deprecated ) )
 		_deprecated_argument( __FUNCTION__, '3.0' );
 
-	$option = preg_replace('|[^a-z0-9_]|i', '', $option);
 	if ( empty($user) )
 		$user = wp_get_current_user();
 	else
@@ -237,6 +236,7 @@
  */
 function update_user_option( $user_id, $option_name, $newvalue, $global = false ) {
 	global $wpdb;
+
 	if ( !$global )
 		$option_name = $wpdb->prefix . $option_name;
 	return update_user_meta( $user_id, $option_name, $newvalue );
@@ -666,4 +666,4 @@
 	wp_cache_delete($user->user_nicename, 'userslugs');
 }
 
-?>
\ No newline at end of file
+?>
Index: wp-admin/admin-ajax.php
===================================================================
--- wp-admin/admin-ajax.php	(revision 13532)
+++ wp-admin/admin-ajax.php	(working copy)
@@ -1019,11 +1019,11 @@
 		die('-1');
 
 	if ( is_array($closed) )
-		update_user_meta($user->ID, 'closedpostboxes_'.$page, $closed);
+		update_user_option($user->ID, "closedpostboxes_$page", $closed);
 
 	if ( is_array($hidden) ) {
 		$hidden = array_diff( $hidden, array('submitdiv', 'linksubmitdiv') ); // postboxes that are always shown
-		update_user_meta($user->ID, 'meta-box-hidden_'.$page, $hidden);
+		update_user_option($user->ID, "meta-box-hidden_$page", $hidden);
 	}
 
 	die('1');
@@ -1041,7 +1041,7 @@
 		die('-1');
 
 	if ( is_array($hidden) )
-		update_user_meta($user->ID, "manage-$page-columns-hidden", $hidden);
+		update_user_option($user->ID, "manage-$page-columns-hidden", $hidden);
 
 	die('1');
 	break;
@@ -1061,7 +1061,7 @@
 		update_user_option($user->ID, "meta-box-order_$page", $order);
 
 	if ( $page_columns )
-		update_user_meta($user->ID, "screen_layout_$page", $page_columns);
+		update_user_option($user->ID, "screen_layout_$page", $page_columns);
 
 	die('1');
 	break;
Index: wp-admin/js/post.dev.js
===================================================================
--- wp-admin/js/post.dev.js	(revision 13532)
+++ wp-admin/js/post.dev.js	(working copy)
@@ -228,17 +228,9 @@
 })(jQuery);
 
 jQuery(document).ready( function($) {
-	var stamp, visibility, sticky = '', post = 'post' == pagenow || 'post-new' == pagenow, page = 'page' == pagenow || 'page-new' == pagenow;
+	var stamp, visibility, sticky = '';
 
-	// postboxes
-	if ( post ) {
-		type = 'post';
-		if ( typenow )
-			type = typenow;
-		postboxes.add_postbox_toggles(type);
-	} else if ( page ) {
-		postboxes.add_postbox_toggles('page');
-	}
+	postboxes.add_postbox_toggles(pagenow);
 
 	// multi-taxonomies
 	if ( $('#tagsdiv-post_tag').length ) {
Index: wp-admin/js/postbox.dev.js
===================================================================
--- wp-admin/js/postbox.dev.js	(revision 13532)
+++ wp-admin/js/postbox.dev.js	(working copy)
@@ -5,6 +5,7 @@
 			this.init(page,args);
 			$('.postbox h3, .postbox .handlediv').click( function() {
 				var p = $(this).parent('.postbox'), id = p.attr('id');
+
 				p.toggleClass('closed');
 				postboxes.save_state(page);
 				if ( id ) {
@@ -19,6 +20,7 @@
 			} );
 			$('.hide-postbox-tog').click( function() {
 				var box = $(this).val();
+
 				if ( $(this).attr('checked') ) {
 					$('#' + box).show();
 					if ( $.isFunction( postboxes.pbshow ) )
@@ -115,7 +117,8 @@
 
 		save_state : function(page) {
 			var closed = $('.postbox').filter('.closed').map(function() { return this.id; }).get().join(','),
-			hidden = $('.postbox').filter(':hidden').map(function() { return this.id; }).get().join(',');
+				hidden = $('.postbox').filter(':hidden').map(function() { return this.id; }).get().join(',');
+
 			$.post(ajaxurl, {
 				action: 'closed-postboxes',
 				closed: closed,
@@ -127,6 +130,7 @@
 
 		save_order : function(page) {
 			var postVars, page_columns = $('.columns-prefs input:checked').val() || 0;
+
 			postVars = {
 				action: 'meta-box-order',
 				_ajax_nonce: $('#meta-box-order-nonce').val(),
Index: wp-admin/admin-header.php
===================================================================
--- wp-admin/admin-header.php	(revision 13532)
+++ wp-admin/admin-header.php	(working copy)
@@ -34,8 +34,17 @@
 <script type="text/javascript">
 //<![CDATA[
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time() ?>'};
-var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', pagenow = '<?php echo substr($pagenow, 0, -4); ?>', typenow = '<?php echo $typenow; ?>', adminpage = '<?php echo $admin_body_class; ?>',  thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>', decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>';
+var userSettings = {
+		'url': '<?php echo SITECOOKIEPATH; ?>', 
+		'uid': '<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>',
+		'time':'<?php echo time() ?>'
+	},
+	ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', 
+	pagenow = '<?php echo $current_screen->id; ?>', 
+	typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>', 
+	adminpage = '<?php echo $admin_body_class; ?>',  
+	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>', 
+	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>';
 //]]>
 </script>
 <?php