golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pinking shears 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19577 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-12-08 23:02:33 +00:00
parent b6efe20e16
commit 9d03183e6d
10 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/wp-admin-rtl.dev.css
View File

@ -1420,7 +1420,7 @@ h2 .nav-tab {
} }
.about-wrap .feature-section .feature-images img { .about-wrap .feature-section .feature-images img {
margin-right: auto; margin-right: auto;
margin-left: 5px; margin-left: 5px;
} }
.about-wrap .feature-section.images-stagger-left .angled-left { .about-wrap .feature-section.images-stagger-left .angled-left {

2
wp-admin/includes/update-core.php
View File

@ -547,7 +547,7 @@ function _redirect_to_about_wordpress( $new_version ) {
if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action ) if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action )
return; return;
// Load the updated default text localization domain for new strings // Load the updated default text localization domain for new strings
load_default_textdomain(); load_default_textdomain();

20
wp-admin/network/site-themes.php
View File

@ -45,8 +45,8 @@ $action = $wp_list_table->current_action();
$s = isset($_REQUEST['s']) ? $_REQUEST['s'] : ''; $s = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
// Clean up request URI from temporary args for screen options/paging uri's to work as expected. // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
$temp_args = array( 'enabled', 'disabled', 'error' ); $temp_args = array( 'enabled', 'disabled', 'error' );
$_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] ); $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] );
$referer = remove_query_arg( $temp_args, wp_get_referer() ); $referer = remove_query_arg( $temp_args, wp_get_referer() );
$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
@ -81,7 +81,7 @@ if ( $action ) {
check_admin_referer( 'disable-theme_' . $_GET['theme'] ); check_admin_referer( 'disable-theme_' . $_GET['theme'] );
$theme = $_GET['theme']; $theme = $_GET['theme'];
$action = 'disabled'; $action = 'disabled';
$n = 1; $n = 1;
if ( !$allowed_themes ) if ( !$allowed_themes )
$allowed_themes = array(); $allowed_themes = array();
else else
@ -158,13 +158,13 @@ foreach ( $tabs as $tab_id => $tab ) {
</h3><?php </h3><?php
if ( isset( $_GET['enabled'] ) ) { if ( isset( $_GET['enabled'] ) ) {
$_GET['enabled'] = absint( $_GET['enabled'] ); $_GET['enabled'] = absint( $_GET['enabled'] );
echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '</p></div>'; echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '</p></div>';
} elseif ( isset( $_GET['disabled'] ) ) { } elseif ( isset( $_GET['disabled'] ) ) {
$_GET['disabled'] = absint( $_GET['disabled'] ); $_GET['disabled'] = absint( $_GET['disabled'] );
echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '</p></div>'; echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '</p></div>';
} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) { } elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>'; echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>';
} ?> } ?>
<p><?php _e( 'Network enabled themes are not shown on this screen.' ) ?></p> <p><?php _e( 'Network enabled themes are not shown on this screen.' ) ?></p>

12
wp-admin/network/site-users.php
View File

@ -36,7 +36,7 @@ get_current_screen()->set_help_sidebar(
'<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>' '<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
); );
$_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] ); $_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] );
$referer = remove_query_arg( 'update', wp_get_referer() ); $referer = remove_query_arg( 'update', wp_get_referer() );
$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
@ -66,7 +66,7 @@ $action = $wp_list_table->current_action();
if ( $action ) { if ( $action ) {
switch_to_blog( $id ); switch_to_blog( $id );
switch ( $action ) { switch ( $action ) {
case 'newuser': case 'newuser':
check_admin_referer( 'add-user', '_wpnonce_add-new-user' ); check_admin_referer( 'add-user', '_wpnonce_add-new-user' );
@ -91,7 +91,7 @@ if ( $action ) {
check_admin_referer( 'add-user', '_wpnonce_add-user' ); check_admin_referer( 'add-user', '_wpnonce_add-user' );
if ( !empty( $_POST['newuser'] ) ) { if ( !empty( $_POST['newuser'] ) ) {
$update = 'adduser'; $update = 'adduser';
$newuser = $_POST['newuser']; $newuser = $_POST['newuser'];
$userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) ); $userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) );
if ( $userid ) { if ( $userid ) {
$user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='{$blog_prefix}capabilities'" ); $user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='{$blog_prefix}capabilities'" );
@ -106,12 +106,12 @@ if ( $action ) {
$update = 'err_add_notfound'; $update = 'err_add_notfound';
} }
break; break;
case 'remove': case 'remove':
if ( !current_user_can('remove_users') ) if ( !current_user_can('remove_users') )
die(__('You can&#8217;t remove users.')); die(__('You can&#8217;t remove users.'));
check_admin_referer( 'bulk-users' ); check_admin_referer( 'bulk-users' );
$update = 'remove'; $update = 'remove';
if ( isset( $_REQUEST['users'] ) ) { if ( isset( $_REQUEST['users'] ) ) {
$userids = $_REQUEST['users']; $userids = $_REQUEST['users'];
@ -151,7 +151,7 @@ if ( $action ) {
} }
break; break;
} }
restore_current_blog(); restore_current_blog();
wp_redirect( add_query_arg( 'update', $update, $referer ) ); wp_redirect( add_query_arg( 'update', $update, $referer ) );
exit(); exit();

12
wp-admin/network/themes.php
View File

@ -34,7 +34,7 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI']
$referer = remove_query_arg( $temp_args, wp_get_referer() ); $referer = remove_query_arg( $temp_args, wp_get_referer() );
if ( $action ) { if ( $action ) {
$allowed_themes = get_site_option( 'allowedthemes' ); $allowed_themes = get_site_option( 'allowedthemes' );
switch ( $action ) { switch ( $action ) {
case 'enable': case 'enable':
check_admin_referer('enable-theme_' . $_GET['theme']); check_admin_referer('enable-theme_' . $_GET['theme']);
@ -128,11 +128,11 @@ if ( $action ) {
if ( $data['Name'] == $main_theme ) { if ( $data['Name'] == $main_theme ) {
unset( $themes[$key] ); unset( $themes[$key] );
} else { } else {
$files_to_delete = array_merge( $files_to_delete, list_files( WP_CONTENT_DIR . "/themes/$theme" ) ); $files_to_delete = array_merge( $files_to_delete, list_files( WP_CONTENT_DIR . "/themes/$theme" ) );
$theme_info[ $theme ] = $data; $theme_info[ $theme ] = $data;
} }
} }
if ( empty( $themes ) ) { if ( empty( $themes ) ) {
wp_redirect( add_query_arg( 'error', 'main', $referer ) ); wp_redirect( add_query_arg( 'error', 'main', $referer ) );
exit; exit;
@ -190,7 +190,7 @@ if ( $action ) {
foreach ( $themes as $theme ) foreach ( $themes as $theme )
$delete_result = delete_theme( $theme, esc_url( add_query_arg( array('verify-delete' => 1), $_SERVER['REQUEST_URI'] ) ) ); $delete_result = delete_theme( $theme, esc_url( add_query_arg( array('verify-delete' => 1), $_SERVER['REQUEST_URI'] ) ) );
$paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1; $paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1;
wp_redirect( network_admin_url( "themes.php?deleted=".count( $themes )."&paged=$paged&s=$s" ) ); wp_redirect( network_admin_url( "themes.php?deleted=".count( $themes )."&paged=$paged&s=$s" ) );
exit; exit;
break; break;
@ -228,8 +228,8 @@ require_once(ABSPATH . 'wp-admin/admin-header.php');
<div class="wrap"> <div class="wrap">
<?php screen_icon('themes'); ?> <?php screen_icon('themes'); ?>
<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php } <h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
if ( $s ) if ( $s )
printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?> printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
</h2> </h2>
<?php <?php

4
wp-admin/network/user-new.php
View File

@ -41,7 +41,7 @@ if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
$user = $_POST['user']; $user = $_POST['user'];
$user_details = wpmu_validate_user_signup( $user['username'], $user['email'] ); $user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
if ( is_wp_error( $user_details[ 'errors' ] ) && ! empty( $user_details[ 'errors' ]->errors ) ) { if ( is_wp_error( $user_details[ 'errors' ] ) && ! empty( $user_details[ 'errors' ]->errors ) ) {
$add_user_errors = $user_details[ 'errors' ]; $add_user_errors = $user_details[ 'errors' ];
} else { } else {
@ -86,7 +86,7 @@ if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
?> ?>
</div> </div>
<?php } ?> <?php } ?>
<form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post"> <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post">
<table class="form-table"> <table class="form-table">
<tr class="form-field form-required"> <tr class="form-field form-required">
<th scope="row"><?php _e( 'Username' ) ?></th> <th scope="row"><?php _e( 'Username' ) ?></th>

4
wp-admin/network/users.php
View File

@ -211,7 +211,7 @@ if ( isset( $_GET['action'] ) ) {
wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) ); wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
exit(); exit();
break; break;
} }
} }
@ -281,7 +281,7 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
if ( current_user_can( 'create_users') ) : ?> if ( current_user_can( 'create_users') ) : ?>
<a href="<?php echo network_admin_url('user-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php <a href="<?php echo network_admin_url('user-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
endif; endif;
if ( !empty( $usersearch ) ) if ( !empty( $usersearch ) )
printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) ); printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
?> ?>

6
wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js
View File

@ -1,8 +1,8 @@
/** /**
* popup.js * popup.js
* *
* An altered version of tinyMCEPopup to work in the same window as tinymce. * An altered version of tinyMCEPopup to work in the same window as tinymce.
* *
* ------------------------------------------------------------------ * ------------------------------------------------------------------
* *
* Copyright 2009, Moxiecode Systems AB * Copyright 2009, Moxiecode Systems AB
@ -278,7 +278,7 @@ var tinyMCEPopup = {
close(); close();
}, },
// Internal functions // Internal functions
_restoreSelection : function() { _restoreSelection : function() {
var e = window.event.srcElement; var e = window.event.srcElement;

2
wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css
View File

@ -1,7 +1,7 @@
/* /*
Distraction Free Writing mode TinyMCE Styles Distraction Free Writing mode TinyMCE Styles
*/ */
html, body { html, body {
background: transparent; background: transparent;
width: auto !important; width: auto !important;

6
wp-includes/js/tinymce/wp-mce-help.php
View File

@ -143,7 +143,7 @@ wp_admin_css( 'wp-admin', true );
.macwebkit tr.mac { .macwebkit tr.mac {
display: table-row; display: table-row;
} }
</style> </style>
<?php if ( is_rtl() ) : ?> <?php if ( is_rtl() ) : ?>
<style type="text/css"> <style type="text/css">
@ -181,7 +181,7 @@ wp_admin_css( 'wp-admin', true );
document.getElementById('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion; document.getElementById('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
document.getElementById('date').innerHTML = tinymce.releaseDate; document.getElementById('date').innerHTML = tinymce.releaseDate;
if ( win.fullscreen && win.fullscreen.settings.visible ) { if ( win.fullscreen && win.fullscreen.settings.visible ) {
d('content1').className = 'hidden'; d('content1').className = 'hidden';
d('tabs').className = 'hidden'; d('tabs').className = 'hidden';
@ -190,7 +190,7 @@ wp_admin_css( 'wp-admin', true );
if ( tinymce.isMac ) if ( tinymce.isMac )
document.body.className = 'macos'; document.body.className = 'macos';
if ( tinymce.isMac && tinymce.isWebKit ) if ( tinymce.isMac && tinymce.isWebKit )
document.body.className = 'macos macwebkit'; document.body.className = 'macos macwebkit';