Wizard 2.8.2-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / theme.php

diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index 8b883e23ab1fa2345e3e0f7f82769866ab2b51df..f6eb03df30fd0d998ee4fd31fb02d9b3dd1aac92 100644 (file)
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -31,6 +31,75 @@ function current_theme_info() {
        return $ct;
 }
 
        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 ( ! is_object($wp_filesystem) )
+               return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+
+       if ( is_wp_error($wp_filesystem->errors) && $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;
+}
+

 /**
  * {@internal Missing Short Description}}
  *
 /**
  * {@internal Missing Short Description}}
  *


@@ -64,11 +133,7 @@ function get_page_templates() {
 
                        $name = '';
                        if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) )
 
                        $name = '';
                        if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) )

-                               $name = $name[1];
-
-                       $description = '';
-                       if( preg_match( '|Description:(.*)$|mi', $template_data, $description ) )
-                               $description = $description[1];
+                               $name = _cleanup_header_comment($name[1]);

 
                        if ( !empty( $name ) ) {
                                $page_templates[trim( $name )] = basename( $template );
 
                        if ( !empty( $name ) ) {
                                $page_templates[trim( $name )] = basename( $template );