Changeset 16241

Timestamp:

11/08/2010 07:40:05 PM (14 years ago)

Author:

ryan

Message:

Use bool for allowed themes. Props PeteMall. see #14897

Location:

trunk/wp-admin

Files:

• includes/class-wp-ms-themes-list-table.php (modified) (1 diff)
• network/themes.php (modified) (2 diffs)

trunk/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -59 +59 @@
 
         foreach ( (array) $themes['all'] as $key => $theme ) {
-            if ( array_key_exists( $theme['Template'], $allowed_themes ) ) {
+            $theme_key = esc_html( $theme['Stylesheet'] );
+            if ( isset( $allowed_themes [ $theme_key ] ) )  {
                 $themes['all'][$key]['enabled'] = true;
                 $themes['enabled'][$key] = $themes['all'][$key];

trunk/wp-admin/network/themes.php

@@ -24 +24 @@
     switch ( $action ) {
         case 'network-enable':
-            $allowed_themes[ $_GET['theme'] ] = 1;
+            $allowed_themes[ $_GET['theme'] ] = true;
             update_site_option( 'allowedthemes', $allowed_themes );
             wp_redirect( wp_get_referer() ); // @todo add_query_arg for update message
@@ -42 +42 @@
             }                       
             foreach( (array) $themes as $theme )
-                $allowed_themes[ $theme ] = 1;
+                $allowed_themes[ $theme ] = true;
             update_site_option( 'allowedthemes', $allowed_themes );
             break;