Make WordPress Core

Changeset 20481


Ignore:
Timestamp:
04/16/2012 06:37:57 PM (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/class-wp-theme.php

    r20374 r20481  
    11411141     */
    11421142    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 );
    11441144    }
    11451145
     
    12151215        }
    12161216
    1217         return $allowed_themes[ $blog_id ];
     1217        return (array) $allowed_themes[ $blog_id ];
    12181218    }
    12191219
Note: See TracChangeset for help on using the changeset viewer.