Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a67b6501e7 | ||
|
bb7f5def49 | ||
|
|
90ff07836f | ||
|
|
db3aa34eb7 | ||
|
|
7c048e745b | ||
|
|
afc218c988 | ||
|
|
61c109e030 | ||
|
|
cad54bba34 | ||
|
|
1f28b09d74 | ||
|
|
056e32340f | ||
|
|
77c7c21043 | ||
|
|
9f6201cbf4 | ||
|
|
434b4605eb | ||
|
|
c52e2c100d | ||
|
|
8c7f681a75 | ||
|
|
c15548e05e | ||
|
|
61aef00dc4 | ||
|
|
f50c0c90cc | ||
|
fd2cfdfcda | ||
|
|
b5bb8c72a8 | ||
|
|
97ebc17ca8 | ||
|
|
c51dfe7bfe |
@@ -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>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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’ve combined the admin bar and the old Dashboard header into one persistent toolbar. Hover over the toolbar items to see what’s new.' ) ) . '</p>';
|
||||
$content = '<h3>' . __( 'New Feature: Toolbar' ) . '</h3>';
|
||||
$content .= '<p>' . __( 'We’ve combined the admin bar and the old Dashboard header into one persistent toolbar. Hover over the toolbar items to see what’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’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’ll put the widgets back the way you had them.' ). '</p>';
|
||||
|
||||
WP_Internal_Pointers::print_js( 'wp330_saving_widgets', '#message2', array(
|
||||
'content' => $content,
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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(){
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -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') )
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -100,10 +100,11 @@ case 'promote':
|
||||
|
||||
if ( ! current_user_can('promote_user', $id) )
|
||||
wp_die(__('You can’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.
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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-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);
|
||||
}
|
||||
|
||||
.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; ?>
|
||||
|
||||
@@ -18,10 +18,12 @@
|
||||
* @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' ) )
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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.")
|
||||
) );
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user