Changeset 25032

Timestamp:

08/16/2013 03:46:08 PM (12 years ago)

Author:

ryan

Message:

Be consistent with the arguments passed to the theme_action_links filter. Stop passing stylesheet from class-wp-ms-themes-list-table.php.

Props georgestephanis
fixes #24478

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-ms-themes-list-table.php (modified) (1 diff)
• class-wp-themes-list-table.php (modified) (1 diff)

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

@@ -285 +285 @@
             $actions['delete'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=delete-selected&amp;checked[]=' . $theme_key . '&amp;theme_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-themes' ) ) . '" title="' . esc_attr__( 'Delete this theme' ) . '" class="delete">' . __( 'Delete' ) . '</a>';
 
-        $actions = apply_filters( 'theme_action_links', array_filter( $actions ), $stylesheet, $theme, $context );
-        $actions = apply_filters( "theme_action_links_$stylesheet", $actions, $stylesheet, $theme, $context );
+        $actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme, $context );
+        $actions = apply_filters( "theme_action_links_$stylesheet", $actions, $theme, $context );
 
         $class = ! $allowed ? 'inactive' : 'active';

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

@@ -150 +150 @@
 
             $actions       = apply_filters( 'theme_action_links', $actions, $theme );
+            $actions       = apply_filters( "theme_action_links_$stylesheet", $actions, $theme );
             $delete_action = isset( $actions['delete'] ) ? '<div class="delete-theme">' . $actions['delete'] . '</div>' : '';
             unset( $actions['delete'] );