<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17237] trunk/wp-admin: Fix net admin theme deletion over FTP.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17237">17237</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-01-07 19:01:34 +0000 (Fri, 07 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix net admin theme deletion over FTP. see <a href="http://trac.wordpress.org/ticket/16117">#16117</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminnetworkthemesphp">trunk/wp-admin/network/themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (17236 => 17237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2011-01-07 17:07:34 UTC (rev 17236)
+++ trunk/wp-admin/includes/theme.php 2011-01-07 19:01:34 UTC (rev 17237)
</span><span class="lines">@@ -43,17 +43,19 @@
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $template Template directory of the theme to delete
</span><ins>+ * @param string $redirect Redirect to page when complete.
</ins><span class="cx"> * @return mixed
</span><span class="cx"> */
</span><del>-function delete_theme($template) {
</del><ins>+function delete_theme($template, $redirect = '') {
</ins><span class="cx"> global $wp_filesystem;
</span><span class="cx">
</span><span class="cx"> if ( empty($template) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> ob_start();
</span><del>- $url = wp_nonce_url('themes.php?action=delete&template=' . $template, 'delete-theme_' . $template);
- if ( false === ($credentials = request_filesystem_credentials($url)) ) {
</del><ins>+ if ( empty( $redirect ) )
+ $redirect = wp_nonce_url('themes.php?action=delete&template=' . $template, 'delete-theme_' . $template);
+ if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
</ins><span class="cx"> $data = ob_get_contents();
</span><span class="cx"> ob_end_clean();
</span><span class="cx"> if ( ! empty($data) ){
</span></span></pre></div>
<a id="trunkwpadminnetworkthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/themes.php (17236 => 17237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/themes.php 2011-01-07 17:07:34 UTC (rev 17236)
+++ trunk/wp-admin/network/themes.php 2011-01-07 19:01:34 UTC (rev 17237)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> } // Endif verify-delete
</span><span class="cx">
</span><span class="cx"> foreach ( $themes as $theme )
</span><del>- $delete_result = delete_theme( $theme );
</del><ins>+ $delete_result = delete_theme( $theme, esc_url( add_query_arg( array('verify-delete' => 1), $_SERVER['REQUEST_URI'] ) ) );
</ins><span class="cx"> wp_redirect( add_query_arg( 'deleted', count( $themes ), $referer ) );
</span><span class="cx"> exit;
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>