Changeset 10715

Timestamp:

03/05/2009 07:15:56 PM (16 years ago)

Author:

ryan

Message:

delete_theme(). see #8678

Location:

trunk/wp-admin

Files:

• includes/plugin.php (modified) (1 diff)
• includes/theme.php (modified) (1 diff)
• themes.php (modified) (2 diffs)

trunk/wp-admin/includes/plugin.php

@@ -472 +472 @@
 
     // Force refresh of plugin update information
-    delete_option('update_plugins');
+    delete_transient('update_plugins');
 
     return true;

trunk/wp-admin/includes/theme.php

@@ -30 +30 @@
     $ct->tags = $themes[$current_theme]['Tags'];
     return $ct;
+}
+
+/**
+ * Remove a theme
+ *
+ * @since 2.8.0
+ *
+ * @param string $template Template directory of the theme to delete
+ * @return mixed
+ */
+function delete_theme($template) {
+    global $wp_filesystem;
+
+    if ( empty($template) )
+        return false;
+
+    ob_start();
+    $url = wp_nonce_url('themes.php?action=delete&template=' . $template, 'delete-theme_' . $template);
+    if ( false === ($credentials = request_filesystem_credentials($url)) ) {
+        $data = ob_get_contents();
+        ob_end_clean();
+        if ( ! empty($data) ){
+            include_once( ABSPATH . 'wp-admin/admin-header.php');
+            echo $data;
+            include( ABSPATH . 'wp-admin/admin-footer.php');
+            exit;
+        }
+        return;
+    }
+
+    if ( ! WP_Filesystem($credentials) ) {
+        request_filesystem_credentials($url, '', true); // Failed to connect, Error and request again
+        $data = ob_get_contents();
+        ob_end_clean();
+        if( ! empty($data) ){
+            include_once( ABSPATH . 'wp-admin/admin-header.php');
+            echo $data;
+            include( ABSPATH . 'wp-admin/admin-footer.php');
+            exit;
+        }
+        return;
+    }
+
+    if ( $wp_filesystem->errors->get_error_code() ) {
+        return $wp_filesystem->errors;
+    }
+
+    if ( ! is_object($wp_filesystem) )
+        return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+
+    if ( $wp_filesystem->errors->get_error_code() )
+        return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
+
+    //Get the base plugin folder
+    $themes_dir = $wp_filesystem->wp_themes_dir();
+    if ( empty($themes_dir) )
+        return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress theme directory.'));
+
+    $themes_dir = trailingslashit( $themes_dir );
+
+    $errors = array();
+
+    $theme_dir = trailingslashit($themes_dir . $template);
+    $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) );
+
+    // Force refresh of theme update information
+    delete_transient('update_themes');
+
+    return true;
 }
 

trunk/wp-admin/themes.php

@@ -18 +18 @@
     } else if ( 'delete' == $_GET['action'] ) {
         check_admin_referer('delete-theme_' . $_GET['template']);
-        die('Not implemented');
+        if ( !current_user_can('update_themes') )
+            wp_die( __( 'Cheatin’ uh?' ) );
+        delete_theme($_GET['template']);
+        wp_redirect('themes.php?deleted=true');
+        exit;
     }
 }
@@ -35 +39 @@
 <?php elseif ( isset($_GET['activated']) ) : ?>
 <div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s">Visit site</a>'), get_bloginfo('url') . '/'); ?></p></div>
+<?php elseif ( isset($_GET['deleted']) ) : ?>
+<div id="message3" class="updated fade"><p><?php _e('Theme deleted.') ?></p></div>
 <?php endif; ?>