vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-12 12:50:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pinking shears

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@25880 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2013-10-23 14:37:54 +00:00
parent b10ef05fb1
commit 30f822b8ee
31 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-admin/includes/class-wp-media-list-table.php
+1 -1
View File
@@ -308,7 +308,7 @@ foreach ( $columns as $column_name => $column_display_name ) {
if ( $parent ) {
$title = _draft_or_post_title( $post->post_parent );
$parent_type = get_post_type_object( $parent->post_type );
$parent_type = get_post_type_object( $parent->post_type );
?>
<td <?php echo $attributes ?>><strong>
<?php if ( current_user_can( 'edit_post', $post->post_parent ) && $parent_type->show_ui ) { ?>
src/wp-admin/includes/class-wp-upgrader-skins.php
+1 -1
View File
@@ -583,7 +583,7 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
/**
* Upgrader Skin for Automatic WordPress Upgrades
*
* This skin is designed to be used when no output is intended, all output
* This skin is designed to be used when no output is intended, all output
* is captured and stored for the caller to process and log/email/discard.
*
* @package WordPress
src/wp-admin/includes/class-wp-upgrader.php
+5 -5
View File
@@ -1933,10 +1933,10 @@ class WP_Automatic_Updater {
update_option( $lock_name, time() );
// Don't automatically run these thins, as we'll handle it ourselves
remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
remove_action( 'upgrader_process_complete', 'wp_version_check' );
remove_action( 'upgrader_process_complete', 'wp_update_plugins' );
remove_action( 'upgrader_process_complete', 'wp_update_themes' );
remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
remove_action( 'upgrader_process_complete', 'wp_version_check' );
remove_action( 'upgrader_process_complete', 'wp_update_plugins' );
remove_action( 'upgrader_process_complete', 'wp_update_themes' );
// Next, Plugins
wp_update_plugins(); // Check for Plugin updates
@@ -2270,7 +2270,7 @@ class WP_Automatic_Updater {
* @type string $subject The email's subject.
* @type string $body The email message body.
* @type string $headers Any email headers, defaults to no headers.
* }
* }
* @param string $type The type of email being sent. Can be one of 'success', 'fail', 'manual', 'critical'.
* @param object $core_update The update offer that was attempted.
* @param mixed $result The result for the core update. Can be WP_Error.
src/wp-admin/includes/deprecated.php
+2 -2
View File
@@ -1121,8 +1121,8 @@ function wp_update_theme($theme, $feedback = '') {
* This was once used to display attachment links. Now it is deprecated and stubbed.
*
* {@internal Missing Short Description}}
*
* @since 2.0.0
*
* @since 2.0.0
* @deprecated 3.7.0
*
* @param unknown_type $id
src/wp-admin/includes/ms.php
+13 -13
View File
@@ -62,7 +62,7 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
$blog = get_blog_details( $blog_id );
/**
* Fires before a blog is deleted.
* Fires before a blog is deleted.
*
* @since MU
*
@@ -295,7 +295,7 @@ function send_confirmation_on_profile_email() {
'newemail' => $_POST['email']
);
update_option( $current_user->ID . '_new_email', $new_user_email );
$email_text = __( 'Dear user,
You recently requested to have the email address on your account changed.
@@ -315,10 +315,10 @@ All at ###SITENAME###
* Filter the email text sent when a user changes emails.
*
* The following strings have a special meaning and will get replaced dynamically:
* ###ADMIN_URL### The link to click on to confirm the email change. Required otherwise this functunalty is will break.
* ###EMAIL### The new email.
* ###ADMIN_URL### The link to click on to confirm the email change. Required otherwise this functunalty is will break.
* ###EMAIL### The new email.
* ###SITENAME### The name of the site.
* ###SITEURL### The URL to the site.
* ###SITEURL### The URL to the site.
*
* @since MU
*
@@ -448,9 +448,9 @@ function update_user_status( $id, $pref, $value, $deprecated = null ) {
if ( $value == 1 ) {
/**
* Fires after the user is marked as a SPAM user.
*
*
* @since 3.0.0
*
*
* @param int $id ID of the user marked as SPAM.
*/
do_action( 'make_spam_user', $id );
@@ -459,7 +459,7 @@ function update_user_status( $id, $pref, $value, $deprecated = null ) {
* Fires after the user is marked as a HAM user. Opposite of SPAM.
*
* @since 3.0.0
*
*
* @param int $id ID of the user marked as HAM.
*/
do_action( 'make_ham_user', $id );
@@ -494,10 +494,10 @@ function format_code_lang( $code = '' ) {
'sg' => 'Sango', 'sa' => 'Sanskrit', 'sr' => 'Serbian', 'hr' => 'Croatian', 'si' => 'Sinhala; Sinhalese', 'sk' => 'Slovak', 'sl' => 'Slovenian', 'se' => 'Northern Sami', 'sm' => 'Samoan', 'sn' => 'Shona', 'sd' => 'Sindhi', 'so' => 'Somali', 'st' => 'Sotho, Southern', 'es' => 'Spanish; Castilian', 'sc' => 'Sardinian', 'ss' => 'Swati', 'su' => 'Sundanese', 'sw' => 'Swahili',
'sv' => 'Swedish', 'ty' => 'Tahitian', 'ta' => 'Tamil', 'tt' => 'Tatar', 'te' => 'Telugu', 'tg' => 'Tajik', 'tl' => 'Tagalog', 'th' => 'Thai', 'bo' => 'Tibetan', 'ti' => 'Tigrinya', 'to' => 'Tonga (Tonga Islands)', 'tn' => 'Tswana', 'ts' => 'Tsonga', 'tk' => 'Turkmen', 'tr' => 'Turkish', 'tw' => 'Twi', 'ug' => 'Uighur; Uyghur', 'uk' => 'Ukrainian', 'ur' => 'Urdu', 'uz' => 'Uzbek',
've' => 'Venda', 'vi' => 'Vietnamese', 'vo' => 'Volapük', 'cy' => 'Welsh','wa' => 'Walloon','wo' => 'Wolof', 'xh' => 'Xhosa', 'yi' => 'Yiddish', 'yo' => 'Yoruba', 'za' => 'Zhuang; Chuang', 'zu' => 'Zulu' );
/**
* Filter the language codes.
*
*
* @since MU
*
* @param array $lang_codes Key/value pair of language codes where key is the short version.
@@ -699,7 +699,7 @@ function grant_super_admin( $user_id ) {
// If global super_admins override is defined, there is nothing to do here.
if ( isset( $super_admins ) )
return false;
/**
* Fires before the user is granted Super Admin privileges.
*
@@ -716,7 +716,7 @@ function grant_super_admin( $user_id ) {
if ( $user && ! in_array( $user->user_login, $super_admins ) ) {
$super_admins[] = $user->user_login;
update_site_option( 'site_admins' , $super_admins );
/**
* Fires after the user is granted Super Admin privileges.
*
@@ -760,7 +760,7 @@ function revoke_super_admin( $user_id ) {
if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
unset( $super_admins[$key] );
update_site_option( 'site_admins', $super_admins );
/**
* Fires after the user's Super Admin privileges are revoked.
*
src/wp-admin/includes/plugin.php
+12 -12
View File
@@ -542,7 +542,7 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen
if ( ! $silent ) {
/**
* Fires before a plugin is activated in activate_plugin() when the $silent parameter is false.
*
*
* @since 2.9.0
*
* @param string $plugin Plugin path to main plugin file with plugin data.
@@ -553,10 +553,10 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen
/**
* Fires before a plugin is activated in activate_plugin() when the $silent parameter is false.
*
*
* The action concatenates the 'activate_' prefix with the $plugin value passed to
* activate_plugin() to create a dynamically-named action.
*
*
* @since 2.0.0
*
* @param bool $network_wide Whether to enable the plugin for all sites in the network
@@ -577,7 +577,7 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen
if ( ! $silent ) {
/**
* Fires after a plugin has been activated in activate_plugin() when the $silent parameter is false.
*
*
* @since 2.9.0
*
* @param string $plugin Plugin path to main plugin file with plugin data.
@@ -627,11 +627,11 @@ function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
/**
* Fires for each plugin being deactivated in deactivate_plugins(), before deactivation
* and when the $silent parameter is false.
*
*
* @since 2.9.0
*
* @param string $plugin Plugin path to main plugin file with plugin data.
* @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
* @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
* or just the current site. Multisite only. Default is false.
*/
do_action( 'deactivate_plugin', $plugin, $network_deactivating );
@@ -657,13 +657,13 @@ function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
/**
* Fires for each plugin being deactivated in deactivate_plugins(), after deactivation
* and when the $silent parameter is false.
*
*
* The action concatenates the 'deactivate_' prefix with the plugin's basename
* to create a dynamically-named action.
*
*
* @since 2.0.0
*
* @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
* @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
* or just the current site. Multisite only. Default is false.
*/
do_action( 'deactivate_' . $plugin, $network_deactivating );
@@ -671,11 +671,11 @@ function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
/**
* Fires for each plugin being deactivated in deactivate_plugins(), after deactivation
* and when the $silent parameter is false.
*
*
* @since 2.9.0
*
* @param string $plugin Plugin path to main plugin file with plugin data.
* @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
* @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
* or just the current site. Multisite only. Default is false.
*/
do_action( 'deactivated_plugin', $plugin, $network_deactivating );
@@ -931,7 +931,7 @@ function uninstall_plugin($plugin) {
/**
* Fires in uninstall_plugin() once the plugin has been uninstalled.
*
*
* The action concatenates the 'uninstall_' prefix with the basename of the
* plugin passed to {@see uninstall_plugin()} to create a dynamically-named action.
*