<!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" />
<title>[21147] branches/3.3/wp-admin: Use stylesheet to identify themes, not template.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21147">21147</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-06-26 21:47:41 +0000 (Tue, 26 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use stylesheet to identify themes, not template. Sanity check values before switching.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches33wpadminincludesclasswpthemeslisttablephp">branches/3.3/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#branches33wpadminincludesclasswpupgraderphp">branches/3.3/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#branches33wpadminthemesphp">branches/3.3/wp-admin/themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches33wpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: branches/3.3/wp-admin/includes/class-wp-themes-list-table.php (21146 => 21147)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.3/wp-admin/includes/class-wp-themes-list-table.php 2012-06-26 21:26:42 UTC (rev 21146)
+++ branches/3.3/wp-admin/includes/class-wp-themes-list-table.php 2012-06-26 21:47:41 UTC (rev 21147)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> $preview_text = esc_attr( sprintf( __( 'Preview of &#8220;%s&#8221;' ), $title ) );
</span><span class="cx"> $tags = $themes[$theme_name]['Tags'];
</span><span class="cx"> $thickbox_class = 'thickbox thickbox-preview';
</span><del>- $activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=".urlencode( $template )."&amp;stylesheet=".urlencode( $stylesheet ), 'switch-theme_' . $template );
</del><ins>+ $activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=".urlencode( $template )."&amp;stylesheet=".urlencode( $stylesheet ), 'switch-theme_' . $stylesheet );
</ins><span class="cx"> $activate_text = esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) );
</span><span class="cx"> $actions = array();
</span><span class="cx"> $actions[] = '<a href="' . $activate_link . '" class="activatelink" title="' . $activate_text . '">' . __( 'Activate' ) . '</a>';
</span></span></pre></div>
<a id="branches33wpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: branches/3.3/wp-admin/includes/class-wp-upgrader.php (21146 => 21147)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.3/wp-admin/includes/class-wp-upgrader.php 2012-06-26 21:26:42 UTC (rev 21146)
+++ branches/3.3/wp-admin/includes/class-wp-upgrader.php 2012-06-26 21:47:41 UTC (rev 21147)
</span><span class="lines">@@ -1415,7 +1415,7 @@
</span><span class="cx"> $template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
</span><span class="cx">
</span><span class="cx"> $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'preview_iframe' => 1, 'TB_iframe' => 'true' ), trailingslashit(esc_url(get_option('home'))) ) );
</span><del>- $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
</del><ins>+ $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $stylesheet);
</ins><span class="cx">
</span><span class="cx"> $install_actions = array(
</span><span class="cx"> 'preview' => '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>',
</span><span class="lines">@@ -1423,7 +1423,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
</span><del>- $install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . $template, 'enable-theme_' . $template ) ) . '" title="' . esc_attr__( 'Enable this theme for all sites in this network' ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
</del><ins>+ $install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . $stylesheet, 'enable-theme_' . $stylesheet ) ) . '" title="' . esc_attr__( 'Enable this theme for all sites in this network' ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
</ins><span class="cx">
</span><span class="cx"> if ( $this->type == 'web' )
</span><span class="cx"> $install_actions['themes_page'] = '<a href="' . self_admin_url('theme-install.php') . '" title="' . esc_attr__('Return to Theme Installer') . '" target="_parent">' . __('Return to Theme Installer') . '</a>';
</span></span></pre></div>
<a id="branches33wpadminthemesphp"></a>
<div class="modfile"><h4>Modified: branches/3.3/wp-admin/themes.php (21146 => 21147)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.3/wp-admin/themes.php 2012-06-26 21:26:42 UTC (rev 21146)
+++ branches/3.3/wp-admin/themes.php 2012-06-26 21:47:41 UTC (rev 21147)
</span><span class="lines">@@ -16,7 +16,17 @@
</span><span class="cx">
</span><span class="cx"> if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
</span><span class="cx"> if ( 'activate' == $_GET['action'] ) {
</span><del>- check_admin_referer('switch-theme_' . $_GET['template']);
</del><ins>+ check_admin_referer('switch-theme_' . $_GET['stylesheet']);
+ $themes = get_allowed_themes();
+ foreach ( $themes as $theme ) {
+ if ( $theme['Stylesheet'] == $_GET['stylesheet'] &&
+ $theme['Template'] == $_GET['template'] ) {
+ $found = true;
+ break;
+ }
+ }
+ if ( empty( $found ) )
+ wp_die( __( 'Cheatin&#8217; uh?' ) );
</ins><span class="cx"> switch_theme($_GET['template'], $_GET['stylesheet']);
</span><span class="cx"> wp_redirect( admin_url('themes.php?activated=true') );
</span><span class="cx"> exit;
</span></span></pre>
</div>
</div>
</body>
</html>