<!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>[14371] trunk/wp-admin:
Move theme_update_available out of the admin page and into the admin includes
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14371">14371</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-05-03 13:29:15 +0000 (Mon, 03 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move theme_update_available out of the admin page and into the admin includes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/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 (14370 => 14371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2010-05-03 13:27:15 UTC (rev 14370)
+++ trunk/wp-admin/includes/theme.php 2010-05-03 13:29:15 UTC (rev 14371)
</span><span class="lines">@@ -241,4 +241,46 @@
</span><span class="cx"> <?php endif;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Check if there is an update for a theme available.
+ *
+ * Will display link, if there is an update available.
+ *
+ * @since 2.7.0
+ *
+ * @param object $theme Theme data object.
+ * @return bool False if no valid info was passed.
+ */
+function theme_update_available( $theme ) {
+ static $themes_update;
+
+ if ( !current_user_can('update_themes' ) )
+ return;
+
+ if ( !isset($themes_update) )
+ $themes_update = get_site_transient('update_themes');
+
+ if ( is_object($theme) && isset($theme->stylesheet) )
+ $stylesheet = $theme->stylesheet;
+ elseif ( is_array($theme) && isset($theme['Stylesheet']) )
+ $stylesheet = $theme['Stylesheet'];
+ else
+ return false; //No valid info passed.
+
+ if ( isset($themes_update->response[ $stylesheet ]) ) {
+ $update = $themes_update->response[ $stylesheet ];
+ $theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['Name'] : '');
+ $details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
+ $update_url = wp_nonce_url('update.php?action=upgrade-theme&amp;theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet);
+ $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Upgrading this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to upgrade.") ) . '\') ) {return true;}return false;"';
+
+ if ( ! current_user_can('update_themes') )
+ printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
+ else if ( empty($update['package']) )
+ printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> <em>automatic upgrade unavailable for this theme</em>.') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
+ else
+ printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s" %5$s>upgrade automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
+ }
+}
+
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (14370 => 14371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-05-03 13:27:15 UTC (rev 14370)
+++ trunk/wp-admin/themes.php 2010-05-03 13:29:15 UTC (rev 14371)
</span><span class="lines">@@ -87,49 +87,6 @@
</span><span class="cx"> ));
</span><span class="cx">
</span><span class="cx"> $themes = array_slice( $themes, $start, $per_page );
</span><del>-
-/**
- * Check if there is an update for a theme available.
- *
- * Will display link, if there is an update available.
- *
- * @since 2.7.0
- *
- * @param object $theme Theme data object.
- * @return bool False if no valid info was passed.
- */
-function theme_update_available( $theme ) {
- static $themes_update;
-
- if ( !current_user_can('update_themes' ) )
- return;
-
- if ( !isset($themes_update) )
- $themes_update = get_site_transient('update_themes');
-
- if ( is_object($theme) && isset($theme->stylesheet) )
- $stylesheet = $theme->stylesheet;
- elseif ( is_array($theme) && isset($theme['Stylesheet']) )
- $stylesheet = $theme['Stylesheet'];
- else
- return false; //No valid info passed.
-
- if ( isset($themes_update->response[ $stylesheet ]) ) {
- $update = $themes_update->response[ $stylesheet ];
- $theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['Name'] : '');
- $details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
- $update_url = wp_nonce_url('update.php?action=upgrade-theme&amp;theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet);
- $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Upgrading this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to upgrade.") ) . '\') ) {return true;}return false;"';
-
- if ( ! current_user_can('update_themes') )
- printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
- else if ( empty($update['package']) )
- printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> <em>automatic upgrade unavailable for this theme</em>.') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
- else
- printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s" %5$s>upgrade automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
- }
-}
-
</del><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span></span></pre>
</div>
</div>
</body>
</html>