Changeset 24189

Timestamp:

05/07/2013 04:35:03 PM (11 years ago)

Author:

nacin

Message:

Fix usage of undeclared variables.

• 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.

Location:

trunk

Files:

• wp-admin/includes/class-wp-media-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• wp-admin/includes/theme-install.php (modified) (2 diffs)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/ms-load.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-media-list-table.php

@@ -48 +48 @@
         $_num_posts = (array) wp_count_attachments();
         $_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));
         foreach ( $matches as $type => $reals )

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -1030 +1030 @@
         $this->upgrade_strings();
 
-        if ( !empty($feedback) )
-            add_filter('update_feedback', $feedback);
-
         // Is an update available?
         if ( !isset( $current->response ) || $current->response == 'latest' )

trunk/wp-admin/includes/theme-install.php

@@ -30 +30 @@
  */
 function install_themes_feature_list() {
+    _deprecated_function( __FUNCTION__, '3.1', 'get_theme_feature_list()' );
+
     if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
         set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
@@ -38 +40 @@
     $feature_list = themes_api( 'feature_list', array() );
     if ( is_wp_error( $feature_list ) )
-        return $features;
+        return array();
 
     set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );

trunk/wp-includes/general-template.php

@@ -1580 +1580 @@
  */
 function the_weekday_date($before='',$after='') {
-    global $wp_locale, $day, $previousweekday;
+    global $wp_locale, $currentday, $previousweekday;
     $the_weekday_date = '';
     if ( $currentday != $previousweekday ) {

trunk/wp-includes/ms-load.php

@@ -70 +70 @@
  */
 function ms_site_check() {
-    global $wpdb;
+    global $wpdb, $current_site;
 
     $blog = get_blog_details();