Changeset 17050

Timestamp:

12/19/2010 01:11:38 AM (15 years ago)

Author:

ryan

Message:

Remove 'Search Results filter from ms themes. fixes #15872

Location:

trunk/wp-admin

Files:

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

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

@@ -205 +205 @@
                     $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
                     break;
-                case 'search':
-                    $text = _n( 'Search Results <span class="count">(%s)</span>', 'Search Results <span class="count">(%s)</span>', $count );
-                    break;
             }
 
@@ -215 +212 @@
                 $url = 'themes.php';
 
-            $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
-                add_query_arg('theme_status', $type, $url),
-                ( $type == $status ) ? ' class="current"' : '',
-                sprintf( $text, number_format_i18n( $count ) )
-            );
+            if ( 'search' != $type ) {
+                $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
+                    add_query_arg('theme_status', $type, $url),
+                    ( $type == $status ) ? ' class="current"' : '',
+                    sprintf( $text, number_format_i18n( $count ) )
+                );
+            }
         }
 

trunk/wp-admin/network/themes.php

@@ -92 +92 @@
 <div class="wrap">
 <?php screen_icon('themes'); ?>
-<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php } ?></h2>
+<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
+if ( $s ) 
+    printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?> 
+</h2>
 
 <form method="get" action="">