Changeset 20481
- Timestamp:
- 04/16/2012 06:37:57 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/class-wp-theme.php
r20374 r20481 1141 1141 */ 1142 1142 public static function get_allowed( $blog_id = null ) { 1143 return array_merge( self::get_allowed_on_network(), self::get_allowed_on_site( $blog_id ));1143 return self::get_allowed_on_network() + self::get_allowed_on_site( $blog_id ); 1144 1144 } 1145 1145 … … 1215 1215 } 1216 1216 1217 return $allowed_themes[ $blog_id ];1217 return (array) $allowed_themes[ $blog_id ]; 1218 1218 } 1219 1219
Note: See TracChangeset
for help on using the changeset viewer.