Changeset 12755

Timestamp:

01/18/2010 11:34:36 PM (15 years ago)

Author:

ryan

Message:

Multisite and formatting cleanups. Introduce get_allowed_themes(). see #11644

Location:

trunk

Files:

• wp-admin/includes/theme.php (modified) (1 diff)
• wp-admin/includes/user.php (modified) (6 diffs)
• wp-admin/themes.php (modified) (2 diffs)
• wp-includes/load.php (modified) (3 diffs)

trunk/wp-admin/includes/theme.php

@@ -118 +118 @@
 
 /**
+ * Get the allowed themes for the current blog.
+ *
+ * @since 3.0
+ *
+ * @uses get_themes()
+ * @uses current_theme_info()
+ * @uses get_site_allowed_themes()
+ * @uses wpmu_get_blog_allowedthemes
+ *
+ * @return array $themes Array of allowed themes.
+ */
+function get_allowed_themes() {
+    if ( !is_multisite() )
+        return get_themes();
+
+    $themes = get_themes();
+    $ct = current_theme_info();
+    $allowed_themes = apply_filters("allowed_themes", get_site_allowed_themes() );
+    if ( $allowed_themes == false )
+        $allowed_themes = array();
+
+    $blog_allowed_themes = wpmu_get_blog_allowedthemes();
+    if ( is_array( $blog_allowed_themes ) )
+        $allowed_themes = array_merge( $allowed_themes, $blog_allowed_themes );
+
+    if ( isset( $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] ) == false )
+        $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] = true;
+
+    reset( $themes );
+    foreach ( $themes as $key => $theme ) {
+        if ( isset( $allowed_themes[ wp_specialchars( $theme[ 'Stylesheet' ] ) ] ) == false )
+            unset( $themes[ $key ] );
+    }
+    reset( $themes );
+    
+    return $themes;
+}
+
+/**
  * Get the Page Templates available in this theme
  *

trunk/wp-admin/includes/user.php

@@ -198 +198 @@
 function get_author_user_ids() {
     global $wpdb;
-    if( !is_multisite() ) {
+    if ( !is_multisite() )
         $level_key = $wpdb->get_blog_prefix() . 'user_level';
-    } else {
+    else
         $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
-    }
+
     return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
 }
@@ -221 +221 @@
     $editable = get_editable_user_ids( $user_id );
 
-    if( !$editable ) {
+    if ( !$editable ) {
         return false;
     } else {
@@ -253 +253 @@
             return array();
     }
-    if( !is_multisite() ) {
+
+    if ( !is_multisite() )
         $level_key = $wpdb->get_blog_prefix() . 'user_level';
-    } else {
+    else
         $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
-    }
 
     $query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
@@ -303 +303 @@
     global $wpdb;
 
-    if ( !is_multisite() ) {
+    if ( !is_multisite() )
         $level_key = $wpdb->get_blog_prefix() . 'user_level';
-    } else {
+    else
         $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
-    }
 
     return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
@@ -333 +332 @@
     $dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
 
-    if( !$editable ) {
+    if ( !$editable ) {
         $other_unpubs = '';
     } else {
@@ -676 +675 @@
 
         $this->query_from_where = "FROM $wpdb->users";
-        if ( $this->role )
+        if ( $this->role ) {
             $this->query_from_where .= $wpdb->prepare(" INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id WHERE $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%' . $this->role . '%');
-        elseif ( !is_multisite() )
+        } elseif ( !is_multisite() ) {
             $this->query_from_where .= " WHERE 1=1";
-        else {
+        } else {
             $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
             $this->query_from_where .= ", $wpdb->usermeta WHERE $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '{$level_key}'";

trunk/wp-admin/themes.php

@@ -13 +13 @@
     wp_die( __( 'Cheatin’ uh?' ) );
 
-if ( is_multisite() ) {
-    $themes = get_themes();
-    $ct = current_theme_info();
-    $allowed_themes = apply_filters("allowed_themes", get_site_allowed_themes() );
-    if ( $allowed_themes == false )
-        $allowed_themes = array();
-
-    $blog_allowed_themes = wpmu_get_blog_allowedthemes();
-    if ( is_array( $blog_allowed_themes ) )
-        $allowed_themes = array_merge( $allowed_themes, $blog_allowed_themes );
-    if ( $blog_id != 1 )
-        unset( $allowed_themes[ "h3" ] );
-
-    if ( isset( $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] ) == false )
-        $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] = true;
-
-    reset( $themes );
-    foreach ( $themes as $key => $theme ) {
-        if ( isset( $allowed_themes[ wp_specialchars( $theme[ 'Stylesheet' ] ) ] ) == false ) {
-            unset( $themes[ $key ] );
-        }
-    }
-    reset( $themes );
-}
 if ( isset($_GET['action']) ) {
     if ( 'activate' == $_GET['action'] ) {
@@ -86 +62 @@
 
 <?php
-if ( !is_multisite() )
-    $themes = get_themes();
+$themes = get_allowed_themes();
 $ct = current_theme_info();
 unset($themes[$ct->name]);

trunk/wp-includes/load.php

@@ -261 +261 @@
 
     wp_cache_init();
+
     if ( function_exists('wp_cache_add_global_groups') ) {
-            if( is_multisite() ) {
-                    wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss'));
-            } else {
-                wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient'));
-            }
+        wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss'));
         wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
     }
@@ -273 +270 @@
 function wp_not_installed() {
     if ( is_multisite() ) {
-            if ( !is_blog_installed() && !defined('WP_INSTALLING') )
-                    die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); // have to die here ~ Mark
+        if ( !is_blog_installed() && !defined('WP_INSTALLING') )
+            die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); // have to die here
     } elseif ( !is_blog_installed() && (strpos($_SERVER['PHP_SELF'], 'install.php') === false && !defined('WP_INSTALLING')) ) {
         if ( defined('WP_SITEURL') )
@@ -294 +291 @@
         if ( $dh = opendir( WPMU_PLUGIN_DIR ) ) {
             $mu_plugins = array ();
-            while ( ( $plugin = readdir( $dh ) ) !== false )
+            while ( ( $plugin = readdir( $dh ) ) !== false ) {
                 if ( substr( $plugin, -4 ) == '.php' )
                     $mu_plugins[] = $plugin;
+            }
             closedir( $dh );
-                    if( is_multisite() )
-                    sort( $mu_plugins );
-            foreach( $mu_plugins as $mu_plugin )
+            sort( $mu_plugins );
+            foreach ( $mu_plugins as $mu_plugin )
                 include_once( WPMU_PLUGIN_DIR . '/' . $mu_plugin );
         }