Changeset 20160

Timestamp:

03/08/2012 05:08:55 PM (13 years ago)

Author:

nacin

Message:

Don't show the Network Enable link for broken themes. Include broken themes in searching on network/themes.php. fixes #20099, see #20103.

File:

• trunk/wp-admin/includes/class-wp-ms-themes-list-table.php (modified) (3 diffs)

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

@@ -89 +89 @@
         if ( $s ) {
             $status = 'search';
-            $themes['search'] = array_filter( $themes['all'], array( &$this, '_search_callback' ) );
+            $themes['search'] = array_filter( array_merge( $themes['all'], $themes['broken'] ), array( &$this, '_search_callback' ) );
         }
 
@@ -284 +284 @@
         $theme_key = $theme->get_stylesheet();
 
-        if ( ! $allowed )
-            $actions['enable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=enable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'enable-theme_' . $theme_key) ) . '" title="' . esc_attr__('Enable this theme') . '" class="edit">' . ( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) ) . '</a>';
-        else
+        if ( ! $allowed ) {
+            if ( ! $theme->errors() )
+                $actions['enable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=enable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'enable-theme_' . $theme_key) ) . '" title="' . esc_attr__('Enable this theme') . '" class="edit">' . ( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) ) . '</a>';
+        } else {
             $actions['disable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=disable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'disable-theme_' . $theme_key) ) . '" title="' . esc_attr__('Disable this theme') . '">' . ( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) ) . '</a>';
+        }
 
         if ( current_user_can('edit_themes') )
@@ -324 +326 @@
                 case 'description':
                     echo "<td class='column-description desc'$style>";
-                    if ( $theme->errors() )
-                        echo '<p><strong>' . $theme->errors()->get_error_message() . '</strong></p>';
+                    if ( $theme->errors() ) {
+                        $pre = $status == 'broken' ? '' : __( 'Broken Theme:' ) . ' ';
+                        echo '<p><strong class="attention">' . $pre . $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'>";