Ticket #16345: 16345.2.diff

wp-admin/includes/dashboard.php

@@ -442 +442 @@
         <form name="searchform" action="<?php echo network_admin_url('users.php'); ?>" method="get">
                 <p>
                         <input type="text" name="s" value="" size="17" />
-                        <?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
+                        <?php submit_button( __( 'Search Users' ), 'button', false, false, array( 'id' => 'submit_users' ) ); ?>
                 </p>
         </form>
 
         <form name="searchform" action="<?php echo network_admin_url('sites.php'); ?>" method="get">
                 <p>
                         <input type="text" name="s" value="" size="17" />
-                        <?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
+                        <?php submit_button( __( 'Search Sites' ), 'button', false, false, array( 'id' => 'submit_sites' ) ); ?>
                 </p>
         </form>
 <?php

wp-admin/themes.php

@@ -149 +149 @@
 <p class="search-box">
         <label class="screen-reader-text" for="theme-search-input"><?php _e('Search Themes'); ?>:</label>
         <input type="text" id="theme-search-input" name="s" value="<?php _admin_search_query(); ?>" />
-        <?php submit_button( __( 'Search Themes' ), 'button', 'submit', false ); ?>
+        <?php submit_button( __( 'Search Themes' ), 'button', false, false, array( 'id' => 'search-submit' ) ); ?>
         <a id="filter-click" href="?filter=1"><?php _e( 'Feature Filter' ); ?></a>
 </p>
 
@@ -184 +184 @@
         <?php endforeach; ?>
 
         <div class="feature-container">
-                <?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', 'submit', false, array( 'style' => 'margin-left: 120px' ) ); ?>
+                <?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', false, false, array( 'style' => 'margin-left: 120px' ) ); ?>
                 &nbsp;
                 <small><a id="mini-filter-click" href="<?php echo esc_url( remove_query_arg( array('filter', 'features', 'submit') ) ); ?>"><?php _e( 'Close filters' )?></a></small>
         </div>