<!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>[20268] trunk/wp-admin/includes/class-wp-upgrader.php: Leverage WP_Theme in the upgrader.</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/20268">20268</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-03-23 10:20:26 +0000 (Fri, 23 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Leverage WP_Theme in the upgrader. Remove debug line from <a href="http://core.trac.wordpress.org/changeset/20267">[20267]</a>. Stop using get_theme_data() as it will be deprecated. see <a href="http://core.trac.wordpress.org/ticket/13774">#13774</a>. see <a href="http://core.trac.wordpress.org/ticket/20103">#20103</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (20267 => 20268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2012-03-23 10:10:06 UTC (rev 20267)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2012-03-23 10:20:26 UTC (rev 20268)
</span><span class="lines">@@ -678,24 +678,22 @@
</span><span class="cx"> // Check to see if we need to install a parent theme
</span><span class="cx"> $theme_info = $this->theme_info();
</span><span class="cx">
</span><del>- // Do we have any business here?
- if ( empty($theme_info['Template']) )
</del><ins>+ if ( ! $theme_info->parent() )
</ins><span class="cx"> return $install_result;
</span><span class="cx">
</span><del>- $this->skin->feedback('parent_theme_search', $theme_info['Template'] );
</del><ins>+ $this->skin->feedback( 'parent_theme_search' );
</ins><span class="cx">
</span><del>- $parent_theme = wp_get_theme( $theme_info['Template'] );
- if ( ! $parent_theme->errors() ) {
- $this->skin->feedback( 'parent_theme_currently_installed', $parent_theme['Name'], $parent_theme['Version'] );
</del><ins>+ if ( ! $theme_info->parent()->errors() ) {
+ $this->skin->feedback( 'parent_theme_currently_installed', $theme_info->parent()->display('Name'), $theme_info->parent()->display('Version') );
</ins><span class="cx"> // We already have the theme, fall through.
</span><span class="cx"> return $install_result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We don't have the parent theme, lets install it
</span><del>- $api = themes_api('theme_information', array('slug' => $theme_info['Template'], 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
</del><ins>+ $api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
</ins><span class="cx">
</span><span class="cx"> if ( ! $api || is_wp_error($api) ) {
</span><del>- $this->skin->feedback('parent_theme_not_found', $theme_info['Template']);
</del><ins>+ $this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') );
</ins><span class="cx"> // Don't show activate or preview actions after install
</span><span class="cx"> add_filter('install_theme_complete_actions', array(&$this, 'hide_activate_preview_actions') );
</span><span class="cx"> return $install_result;
</span><span class="lines">@@ -711,9 +709,6 @@
</span><span class="cx">
</span><span class="cx"> $this->skin->feedback('parent_theme_prepare_install', $api->name, $api->version);
</span><span class="cx">
</span><del>- //@TODO: This is a DEBUG line! Only needed with the-common-blog line above.
- remove_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter'), 10, 3); // This is only needed when we're forcing a template on line 676 above.
-
</del><span class="cx"> add_filter('install_theme_complete_actions', '__return_false', 999); // Don't show any actions after installing the theme.
</span><span class="cx">
</span><span class="cx"> // Install the parent theme
</span><span class="lines">@@ -916,14 +911,17 @@
</span><span class="cx"> if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, lets not prevent installation.
</span><span class="cx"> return $source;
</span><span class="cx">
</span><del>- if ( ! file_exists( $working_directory . 'style.css' ) ) // A proper archive should have a style.css file in the single subdirectory
</del><ins>+ // A proper archive should have a style.css file in the single subdirectory
+ if ( ! file_exists( $working_directory . 'style.css' ) )
</ins><span class="cx"> return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('The theme is missing the <code>style.css</code> stylesheet.') );
</span><span class="cx">
</span><del>- $info = get_theme_data( $working_directory . 'style.css' );
- if ( empty($info['Name']) )
</del><ins>+ $info = get_file_data( $working_directory . 'style.css', array( 'Name' => 'Theme Name', 'Template' => 'Template' ) );
+
+ if ( empty( $info['Name'] ) )
</ins><span class="cx"> return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __("The <code>style.css</code> stylesheet doesn't contain a valid theme header.") );
</span><span class="cx">
</span><del>- if ( empty($info['Template']) && ! file_exists( $working_directory . 'index.php' ) ) // If no template is set, it must have at least an index.php to be legit.
</del><ins>+ // If it's not a child theme, it must have at least an index.php to be legit.
+ if ( empty( $info['Template'] ) && ! file_exists( $working_directory . 'index.php' ) )
</ins><span class="cx"> return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('The theme is missing the <code>index.php</code> file.') );
</span><span class="cx">
</span><span class="cx"> return $source;
</span><span class="lines">@@ -951,15 +949,15 @@
</span><span class="cx">
</span><span class="cx"> $theme = isset($theme['theme']) ? $theme['theme'] : '';
</span><span class="cx">
</span><del>- if ( $theme != get_stylesheet() ) //If not current
</del><ins>+ if ( $theme != get_stylesheet() ) // If not current
</ins><span class="cx"> return $return;
</span><span class="cx">
</span><del>- //Ensure stylesheet name hasnt changed after the upgrade:
</del><ins>+ // Ensure stylesheet name hasnt changed after the upgrade:
</ins><span class="cx"> // @TODO: Note, This doesn't handle the Template changing, or the Template name changing.
</span><span class="cx"> if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
</span><span class="cx"> $theme_info = $this->theme_info();
</span><span class="cx"> $stylesheet = $this->result['destination_name'];
</span><del>- $template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
</del><ins>+ $template = $theme_info->get_template();
</ins><span class="cx"> switch_theme($template, $stylesheet, true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -992,7 +990,7 @@
</span><span class="cx"> else
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- return get_theme_data(WP_CONTENT_DIR . '/themes/' . $theme . '/style.css');
</del><ins>+ return wp_get_theme( $theme, WP_CONTENT_DIR . '/themes/' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -1371,12 +1369,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function before() {
</span><del>- parent::before($this->theme_info['Name']);
</del><ins>+ parent::before( $this->theme_info->display('Name') );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function after() {
</span><del>- parent::after($this->theme_info['Name']);
</del><ins>+ parent::after( $this->theme_info->display('Name') );
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> function bulk_footer() {
</span><span class="cx"> parent::bulk_footer();
</span><span class="cx"> $update_actions = array(
</span><span class="lines">@@ -1384,7 +1383,7 @@
</span><span class="cx"> 'updates_page' => '<a href="' . self_admin_url('update-core.php') . '" title="' . esc_attr__('Go to WordPress Updates page') . '" target="_parent">' . __('Return to WordPress Updates') . '</a>'
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $update_actions = apply_filters('update_bulk_theme_complete_actions', $update_actions, $this->theme_info);
</del><ins>+ $update_actions = apply_filters('update_bulk_theme_complete_actions', $update_actions, $this->theme_info );
</ins><span class="cx"> if ( ! empty($update_actions) )
</span><span class="cx"> $this->feedback(implode(' | ', (array)$update_actions));
</span><span class="cx"> }
</span><span class="lines">@@ -1488,9 +1487,9 @@
</span><span class="cx"> $theme_info = $this->upgrader->theme_info();
</span><span class="cx"> if ( empty($theme_info) )
</span><span class="cx"> return;
</span><del>- $name = $theme_info['Name'];
</del><ins>+ $name = $theme_info->display('Name');
</ins><span class="cx"> $stylesheet = $this->upgrader->result['destination_name'];
</span><del>- $template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
</del><ins>+ $template = $theme_info->get_template();
</ins><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><span class="cx"> $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
</span><span class="lines">@@ -1541,13 +1540,10 @@
</span><span class="cx"> function after() {
</span><span class="cx">
</span><span class="cx"> $update_actions = array();
</span><del>- if ( !empty($this->upgrader->result['destination_name']) &&
- ($theme_info = $this->upgrader->theme_info()) &&
- !empty($theme_info) ) {
-
- $name = $theme_info['Name'];
</del><ins>+ if ( ! empty( $this->upgrader->result['destination_name'] ) && $theme_info = $this->upgrader->theme_info() ) {
+ $name = $theme_info->display('Name');
</ins><span class="cx"> $stylesheet = $this->upgrader->result['destination_name'];
</span><del>- $template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
</del><ins>+ $template = $theme_info->get_template();
</ins><span class="cx">
</span><span class="cx"> $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), trailingslashit(esc_url(get_option('home'))) ) );
</span><span class="cx"> $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
</span></span></pre>
</div>
</div>
</body>
</html>