Changeset 936

Timestamp:

03/26/07 15:46:27 (2 years ago)

Author:

donncha

Message:

Index allowed_themes by stylesheet path instead of name. (fixes #284)
Important! Make sure you visit and save wp-admin/wpmu-themes.php to update the list!

Files:

• trunk/wp-admin/admin-db.php (modified) (1 diff)
• trunk/wp-admin/themes.php (modified) (3 diffs)
• trunk/wp-admin/wpmu-blogs.php (modified) (2 diffs)
• trunk/wp-admin/wpmu-edit.php (modified) (2 diffs)

trunk/wp-admin/admin-db.php

@@ -628 +628 @@
-}
-
+function wpmu_get_blog_allowedthemes( $blog_id = 0 ) {
+        $themes = get_themes();
+        if( $blog_id == 0 )
+                $blog_allowed_themes = get_option( "allowedthemes" );
+        else 
+                $blog_allowed_themes = get_blog_option( $blog_id, "allowedthemes" );
+        if( !is_array( $blog_allowed_themes ) || empty( $blog_allowed_themes ) ) { // convert old allowed_themes to new allowedthemes
+                if( $blog_id == 0 )
+                        $blog_allowed_themes = get_option( "allowed_themes" );
+                else 
+                        $blog_allowed_themes = get_blog_option( $blog_id, "allowed_themes" );
+                if( is_array( $blog_allowed_themes ) ) {
+                        foreach( $themes as $key => $theme ) {
+                                $theme_key = wp_specialchars( $theme[ 'Stylesheet' ] );
+                                if( isset( $blog_allowed_themes[ $key ] ) == true ) {
+                                        $blog_allowedthemes[ $theme_key ] = 1;
+                                }
+                        }
+                        $blog_allowed_themes = $blog_allowedthemes;
+                        if( $blog_id == 0 ) {
+                                add_option( "allowedthemes", $blog_allowed_themes );
+                                delete_option( "allowed_themes" );
+                        } else {
+                                add_blog_option( $blog_id, "allowedthemes", $blog_allowed_themes );
+                                delete_blog_option( $blog_id, "allowed_themes" );
+                        }
+                }
+        }
+
+        return $blog_allowed_themes;
+}
+
-?>

trunk/wp-admin/themes.php

@@ -4 +4 @@
-$themes = get_themes();
-$ct = current_theme_info();
-
-
-
-
-
-
-
+
+
+
-
+$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" ] );
-
-$ct->title ] ) == false ) {
-$ct->title
-
+wp_specialchars( $ct->stylesheet ) ] ) == false )
+wp_specialchars( $ct->stylesheet )
+
-reset( $themes );
-
-$key
-
+
+wp_specialchars( $theme[ 'Stylesheet' ] )
+       
-    }
-}
@@ -76 +75 @@
-</div>
-
+<br style="clear: both" />
-<h2><?php _e('Available Themes'); ?></h2>
-<?php if ( 1 < count($themes) ) { ?>
@@ -119 +119 @@
-?>
-
-
+ (Site admin only)
-<p><?php _e('The following themes are installed but incomplete.  Themes must have a stylesheet and a template.'); ?></p>
-

trunk/wp-admin/wpmu-blogs.php

@@ -14 +14 @@
-switch( $_GET[ 'action' ] ) {
-    case "editblog":
-
-
-
-
-
-
+
+
+
+
+
+
+
-    ?>
-    <form name="form1" method="post" action="wpmu-edit.php?action=updateblog"> 
@@ -104 +105 @@
-    <td valign='top'>
-    <?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        }
+        $out = '';
+        foreach( $themes as $key => $theme ) {
+                $theme_key = wp_specialchars( $theme[ 'Stylesheet' ] );
+                if( isset( $allowed_themes[ $theme_key ] ) == false ) {
+                        if( isset( $blog_allowed_themes[ $theme_key ] ) == true ) {
+                                $checked = 'checked ';
+                        } else {
+                                $checked = '';
+                        }
+
+                        $out .= '
+                        <tr valign="top"> 
+                        <th title="' . htmlspecialchars( $theme[ "Description" ] ) . '" scope="row">'.$key.'</th> 
+                        <td><input name="theme['.$theme_key.']" type="checkbox" id="'.$key.'" value="on" '.$checked.'/></td> 
+                        </tr> ';
+                }
-    }
-    if( $out != '' ) {
-
-
-
-
-
-    
+       
+       
+       
+       
+       
+       
-    $blogusers = get_users_of_blog( $_GET[ 'id' ] );
-    print '<div class="wrap"><h3>' . __('Blog Users') . '</h3>';

trunk/wp-admin/wpmu-edit.php

@@ -159 +159 @@
-                if( is_array( $_POST[ 'theme' ] ) ) {
-                        $allowed_themes = $_POST[ 'theme' ];
-_
+
-                } else {
-_
+
-                }
-                if( is_array( $_POST[ 'option' ] ) ) {
@@ -383 +383 @@
-        break;
-        case "updatethemes":
- {
-
-
+
+
+
-                if( is_array( $_POST[ 'theme' ] ) ) {
-array_flip( array_keys( get_themes() ) 
+get_themes(
-                        reset( $themes );
-
-
-
-
-
-
+
+
+
+
+
-                }
-                wp_redirect( add_query_arg( "updated", "themesupdated", $_SERVER[ 'HTTP_REFERER' ] ) );