sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix usage of undeclared variables.

Browse Source 
* the_weekday_date() needs the global $currentday
 * ms_site_check() needs the global $current_site
 * media list table does not need to check for $total_orphans
 * upgrader has no $feedback variable, appears to be copypasta from other upgrade APIs
 * install_themes_feature_list() has no $features variable, return array() instead of a new return type of WP_Error

see #24210.



git-svn-id: https://develop.svn.wordpress.org/trunk@24189 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2013-05-07 16:35:03 +00:00
parent 06507af832
commit 7a9f91869e
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/class-wp-media-list-table.php
View File

@ -47,8 +47,7 @@ class WP_Media_List_Table extends WP_List_Table {
$type_links = array(); $type_links = array();
$_num_posts = (array) wp_count_attachments(); $_num_posts = (array) wp_count_attachments();
$_total_posts = array_sum($_num_posts) - $_num_posts['trash']; $_total_posts = array_sum($_num_posts) - $_num_posts['trash'];
if ( !isset( $total_orphans ) ) $total_orphans = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1" );
$total_orphans = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1" );
$matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts)); $matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
foreach ( $matches as $type => $reals ) foreach ( $matches as $type => $reals )
foreach ( $reals as $real ) foreach ( $reals as $real )

3
wp-admin/includes/class-wp-upgrader.php
View File

@ -1029,9 +1029,6 @@ class Core_Upgrader extends WP_Upgrader {
$this->init(); $this->init();
$this->upgrade_strings(); $this->upgrade_strings();
if ( !empty($feedback) )
add_filter('update_feedback', $feedback);
// Is an update available? // Is an update available?
if ( !isset( $current->response ) || $current->response == 'latest' ) if ( !isset( $current->response ) || $current->response == 'latest' )
return new WP_Error('up_to_date', $this->strings['up_to_date']); return new WP_Error('up_to_date', $this->strings['up_to_date']);

4
wp-admin/includes/theme-install.php
View File

@ -29,6 +29,8 @@ $theme_field_defaults = array( 'description' => true, 'sections' => false, 'test
* @return array * @return array
*/ */
function install_themes_feature_list() { function install_themes_feature_list() {
_deprecated_function( __FUNCTION__, '3.1', 'get_theme_feature_list()' );
if ( !$cache = get_transient( 'wporg_theme_feature_list' ) ) if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS ); set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
@ -37,7 +39,7 @@ function install_themes_feature_list() {
$feature_list = themes_api( 'feature_list', array() ); $feature_list = themes_api( 'feature_list', array() );
if ( is_wp_error( $feature_list ) ) if ( is_wp_error( $feature_list ) )
return $features; return array();
set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS ); set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );

2
wp-includes/general-template.php
View File

@ -1579,7 +1579,7 @@ function the_weekday() {
* @param string $after Optional Output after the date. * @param string $after Optional Output after the date.
*/ */
function the_weekday_date($before='',$after='') { function the_weekday_date($before='',$after='') {
global $wp_locale, $day, $previousweekday; global $wp_locale, $currentday, $previousweekday;
$the_weekday_date = ''; $the_weekday_date = '';
if ( $currentday != $previousweekday ) { if ( $currentday != $previousweekday ) {
$the_weekday_date .= $before; $the_weekday_date .= $before;

2
wp-includes/ms-load.php
View File

@ -69,7 +69,7 @@ function wp_get_active_network_plugins() {
* @return bool|string Returns true on success, or drop-in file to include. * @return bool|string Returns true on success, or drop-in file to include.
*/ */
function ms_site_check() { function ms_site_check() {
global $wpdb; global $wpdb, $current_site;
$blog = get_blog_details(); $blog = get_blog_details();