Changeset 20151

Timestamp:

03/08/2012 07:32:42 AM (15 years ago)

Author:

nacin

Message:

In multisite, list broken themes on network/themes.php instead of on individual Manage Themes pages. see #20103.

Location:

trunk/wp-admin

Files:

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

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

@@ -17 +17 @@
 
                 $status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all';
-                if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search' ) ) )
+                if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) )
                         $status = 'all';
 
@@ -60 +60 @@
                         'enabled' => array(),
                         'disabled' => array(),
-                        'upgrade' => array()
+                        'upgrade' => array(),
+                        'broken' => $this->is_site_themes ? array() : wp_get_themes( array( 'errors' => true ) ),
                 );
 
@@ -71 +72 @@
                 }
 
-                $current = current_user_can( 'update_themes' ) && ! $this->is_site_themes && get_site_transient( 'update_themes' );
+                $maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && get_site_transient( 'update_themes' );
 
                 foreach ( (array) $themes['all'] as $key => $theme ) {
@@ -82 +83 @@
                         $themes[ $filter ][ $key ] = $themes['all'][ $key ];
 
-                        if ( $current && isset( $current->response[ $key ] ) )
+                        if ( $maybe_update && isset( $current->response[ $key ] ) )
                                 $themes['upgrade'][ $key ] = $themes['all'][ $key ];
                 }
@@ -206 +207 @@
                                 case 'upgrade':
                                         $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
+                                        break;
+                                case 'broken' :
+                                        $text = _n( 'Broken <span class="count">(%s)</span>', 'Broken <span class="count">(%s)</span>', $count );
                                         break;
                         }
@@ -298 +302 @@
                 $checkbox = "<input type='checkbox' name='checked[]' value='" . esc_attr( $theme_key ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $theme->display('Name') . "</label>";
 
-                $description = '<p>' . $theme->display( 'Description' ) . '</p>';
-
                 $id = sanitize_html_class( $theme->get_stylesheet() );
 
@@ -321 +323 @@
                                         break;
                                 case 'description':
-                                        echo "<td class='column-description desc'$style>
-                                                <div class='theme-description'>" . $theme->display( 'Description' ) . "</div>
+                                        echo "<td class='column-description desc'$style>";
+                                        if ( $theme->errors() )
+                                                echo '<p><strong>' . $theme->errors()->get_error_message() . '</strong></p>';
+                                        echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
                                                 <div class='$class second theme-version-author-uri'>";
 

trunk/wp-admin/network/themes.php

@@ -41 +41 @@
                         $allowed_themes[ $_GET['theme'] ] = true;
                         update_site_option( 'allowedthemes', $allowed_themes );
-                        wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
+                        wp_safe_redirect( add_query_arg( 'enabled', 1, $referer ) );
                         exit;
                         break;
@@ -245 +245 @@
 </form>
 
-<?php $wp_list_table->views(); ?>
+<?php
+$wp_list_table->views();
+
+if ( 'broken' == $status )
+        echo '<p class="clear">' . __('The following themes are installed but incomplete. Themes must have a stylesheet and a template.') . '</p>';
+?>
 
 <form method="post" action="">

trunk/wp-admin/themes.php

@@ -215 +215 @@
 <?php
 // List broken themes, if any.
-if ( current_user_can('edit_themes') && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {
+if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {
 ?>