Ticket #15306: 15306.ms.patch

wp-admin/includes/theme.php

@@ -151 +151 @@
 
         $blog_allowed_themes = wpmu_get_blog_allowedthemes();
         if ( is_array( $blog_allowed_themes ) )
-                $allowed_themes = array_merge( $allowed_themes, $blog_allowed_themes );
+                $allowed_themes = $allowed_themes + $blog_allowed_themes;
 
         if ( isset( $allowed_themes[ esc_html( $ct->stylesheet ) ] ) == false )
                 $allowed_themes[ esc_html( $ct->stylesheet ) ] = true;