Changeset 20481

Timestamp:

04/16/2012 06:37:57 PM (13 years ago)

Author:

nacin

Message:

Add arrays together in WP_Theme::get_allowed() to preserve keys (theme names could be numeric). props ocean90, fixes #15306.

File:

• trunk/wp-includes/class-wp-theme.php (modified) (2 diffs)

trunk/wp-includes/class-wp-theme.php

@@ -1141 +1141 @@
      */
     public static function get_allowed( $blog_id = null ) {
-        return array_merge( self::get_allowed_on_network(), self::get_allowed_on_site( $blog_id ) );
+        return self::get_allowed_on_network() + self::get_allowed_on_site( $blog_id );
     }
 
@@ -1215 +1215 @@
         }
 
-        return $allowed_themes[ $blog_id ];
+        return (array) $allowed_themes[ $blog_id ];
     }