Changeset 21010 for trunk/wp-admin/includes/theme.php

Timestamp:

06/06/2012 08:34:24 PM (12 years ago)

Author:

nacin

Message:

Theme Customizer: Block non-existent or non-allowed themes, unless the non-allowed theme is the active theme. Support a user having edit_theme_options xor switch_themes. fixes #20852.

File:

• trunk/wp-admin/includes/theme.php (modified) (2 diffs)

trunk/wp-admin/includes/theme.php

@@ -12 +12 @@
  * @since 2.8.0
  *
- * @param string $template Template directory of the theme to delete
+ * @param string $stylesheet Stylesheet of the theme to delete
  * @param string $redirect Redirect to page when complete.
  * @return mixed
  */
-function delete_theme($template, $redirect = '') {
+function delete_theme($stylesheet, $redirect = '') {
     global $wp_filesystem;
 
-    if ( empty($template) )
+    if ( empty($stylesheet) )
         return false;
 
     ob_start();
     if ( empty( $redirect ) )
-        $redirect = wp_nonce_url('themes.php?action=delete&template=' . $template, 'delete-theme_' . $template);
+        $redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . $stylesheet, 'delete-theme_' . $stylesheet);
     if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
         $data = ob_get_contents();
@@ -62 +62 @@
 
     $themes_dir = trailingslashit( $themes_dir );
-    $theme_dir = trailingslashit($themes_dir . $template);
+    $theme_dir = trailingslashit($themes_dir . $stylesheet);
     $deleted = $wp_filesystem->delete($theme_dir, true);
 
     if ( ! $deleted )
-        return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s.'), $template) );
+        return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s.'), $stylesheet) );
 
     // Force refresh of theme update information