Changeset 17237

Timestamp:

01/07/2011 07:01:34 PM (14 years ago)

Author:

ryan

Message:

Fix net admin theme deletion over FTP. see #16117

Location:

trunk/wp-admin

Files:

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

trunk/wp-admin/includes/theme.php

@@ -44 +44 @@
  *
  * @param string $template Template directory of the theme to delete
+ * @param string $redirect Redirect to page when complete.
  * @return mixed
  */
-function delete_theme($template) {
+function delete_theme($template, $redirect = '') {
     global $wp_filesystem;
 
@@ -53 +54 @@
 
     ob_start();
-    $url = wp_nonce_url('themes.php?action=delete&template=' . $template, 'delete-theme_' . $template);
-    if ( false === ($credentials = request_filesystem_credentials($url)) ) {
+    if ( empty( $redirect ) )
+        $redirect = wp_nonce_url('themes.php?action=delete&template=' . $template, 'delete-theme_' . $template);
+    if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
         $data = ob_get_contents();
         ob_end_clean();

trunk/wp-admin/network/themes.php

@@ -161 +161 @@
 
             foreach ( $themes as $theme )
-                $delete_result = delete_theme( $theme );
+                $delete_result = delete_theme( $theme, esc_url( add_query_arg( array('verify-delete' => 1), $_SERVER['REQUEST_URI'] ) ) );
             wp_redirect( add_query_arg( 'deleted', count( $themes ), $referer ) );
             exit;