<!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>[20033] trunk/wp-includes/theme.php: Update switch_theme() to use wp_get_theme().</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/20033">20033</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-02-29 05:09:29 +0000 (Wed, 29 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update switch_theme() to use wp_get_theme(). see <a href="http://core.trac.wordpress.org/ticket/20103">#20103</a>, <a href="http://core.trac.wordpress.org/ticket/20138">#20138</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (20032 => 20033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2012-02-29 01:31:04 UTC (rev 20032)
+++ trunk/wp-includes/theme.php 2012-02-29 05:09:29 UTC (rev 20033)
</span><span class="lines">@@ -633,7 +633,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Prevent theme mods to current theme being used on theme being previewed
</span><del>- add_filter( 'pre_option_mods_' . get_current_theme(), '__return_empty_array' );
</del><ins>+ add_filter( 'pre_option_theme_mods_' . get_option( 'stylesheet' ), '__return_empty_array' );
</ins><span class="cx">
</span><span class="cx"> ob_start( 'preview_theme_ob_filter' );
</span><span class="cx"> }
</span><span class="lines">@@ -711,37 +711,38 @@
</span><span class="cx"> * Switches current theme to new template and stylesheet names.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span><del>- * @uses do_action() Calls 'switch_theme' action on updated theme display name.
</del><ins>+ * @uses do_action() Calls 'switch_theme' action, passing the new theme.
</ins><span class="cx"> *
</span><span class="cx"> * @param string $template Template name
</span><span class="cx"> * @param string $stylesheet Stylesheet name.
</span><span class="cx"> */
</span><del>-function switch_theme($template, $stylesheet) {
</del><ins>+function switch_theme( $template, $stylesheet ) {
</ins><span class="cx"> global $wp_theme_directories, $sidebars_widgets;
</span><span class="cx">
</span><span class="cx"> if ( is_array( $sidebars_widgets ) )
</span><span class="cx"> set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $sidebars_widgets ) );
</span><span class="cx">
</span><del>- $old_theme = get_current_theme();
</del><ins>+ $old_theme = wp_get_theme();
+ $new_theme = wp_get_theme( $stylesheet );
+ $new_name = $new_theme->get('Name');
</ins><span class="cx">
</span><del>- update_option('template', $template);
- update_option('stylesheet', $stylesheet);
</del><ins>+ update_option( 'template', $template );
+ update_option( 'stylesheet', $stylesheet );
</ins><span class="cx">
</span><del>- if ( count($wp_theme_directories) > 1 ) {
- update_option('template_root', get_raw_theme_root($template, true));
- update_option('stylesheet_root', get_raw_theme_root($stylesheet, true));
</del><ins>+ if ( count( $wp_theme_directories ) > 1 ) {
+ update_option( 'template_root', get_raw_theme_root( $template, true ) );
+ update_option( 'stylesheet_root', get_raw_theme_root( $stylesheet, true ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- delete_option('current_theme');
- $theme = get_current_theme();
</del><ins>+ update_option( 'current_theme', $new_name );
</ins><span class="cx">
</span><del>- if ( is_admin() && false === get_option( "theme_mods_$stylesheet" ) ) {
- $default_theme_mods = (array) get_option( "mods_$theme" );
</del><ins>+ if ( is_admin() && false === get_option( 'theme_mods_' . $stylesheet ) ) {
+ $default_theme_mods = (array) get_option( 'mods_' . $new_name );
</ins><span class="cx"> add_option( "theme_mods_$stylesheet", $default_theme_mods );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- update_option( 'theme_switched', $old_theme );
- do_action( 'switch_theme', $theme );
</del><ins>+ update_option( 'theme_switched', $old_theme->get('Name') );
+ do_action( 'switch_theme', $new_name, $new_theme );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>