<!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>[19410] trunk/wp-admin/includes: Introduce initial_db_version and leverage it so that pointers only get shown to updated installs, not new 3.3 installs.</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/19410">19410</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2011-11-22 21:50:50 +0000 (Tue, 22 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce initial_db_version and leverage it so that pointers only get shown to updated installs, not new 3.3 installs. props nacin. see <a href="http://core.trac.wordpress.org/ticket/18693">#18693</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (19409 => 19410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2011-11-22 21:47:28 UTC (rev 19409)
+++ trunk/wp-admin/includes/schema.php 2011-11-22 21:50:50 UTC (rev 19410)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> * @uses $wp_db_version
</span><span class="cx"> */
</span><span class="cx"> function populate_options() {
</span><del>- global $wpdb, $wp_db_version, $current_site;
</del><ins>+ global $wpdb, $wp_db_version, $current_site, $wp_db_current_db_version;
</ins><span class="cx">
</span><span class="cx"> $guessurl = wp_guess_url();
</span><span class="cx">
</span><span class="lines">@@ -480,6 +480,12 @@
</span><span class="cx"> 'default_post_format' => 0,
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ // 3.3
+ if ( ! is_multisite() ) {
+ $options['initial_db_version'] = ! empty( $wp_db_current_db_version ) && $wp_current_db_version < $wp_db_version
+ ? $wp_current_db_version : $wp_db_version;
+ }
+
</ins><span class="cx"> // 3.0 multisite
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> /* translators: blog tagline */
</span><span class="lines">@@ -886,7 +892,8 @@
</span><span class="cx"> 'add_new_users' => '0',
</span><span class="cx"> 'upload_space_check_disabled' => '0',
</span><span class="cx"> 'subdomain_install' => intval( $subdomain_install ),
</span><del>- 'global_terms_enabled' => global_terms_enabled() ? '1' : '0'
</del><ins>+ 'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
+ 'initial_db_version' => get_option( 'initial_db_version' ),
</ins><span class="cx"> );
</span><span class="cx"> if ( ! $subdomain_install )
</span><span class="cx"> $sitemeta['illegal_names'][] = 'blog';
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (19409 => 19410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2011-11-22 21:47:28 UTC (rev 19409)
+++ trunk/wp-admin/includes/template.php 2011-11-22 21:50:50 UTC (rev 19410)
</span><span class="lines">@@ -1677,10 +1677,14 @@
</span><span class="cx"> * remove_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_wp330_toolbar' ) );
</span><span class="cx"> */
</span><span class="cx"> public static function enqueue_scripts( $hook_suffix ) {
</span><ins>+ if ( get_site_option( 'initial_db_version' ) >= 19389 ) // Final db_version for 3.3.
+ return;
+
</ins><span class="cx"> /*
</span><span class="cx"> * Register feature pointers
</span><span class="cx"> * Format: array( hook_suffix => pointer_id )
</span><span class="cx"> */
</span><ins>+
</ins><span class="cx"> $registered_pointers = array(
</span><span class="cx"> 'index.php' => 'wp330_toolbar',
</span><span class="cx"> 'post-new.php' => 'wp330_media_uploader',
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (19409 => 19410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2011-11-22 21:47:28 UTC (rev 19409)
+++ trunk/wp-admin/includes/upgrade.php 2011-11-22 21:50:50 UTC (rev 19410)
</span><span class="lines">@@ -1151,7 +1151,12 @@
</span><span class="cx"> && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) )
</span><span class="cx"> delete_metadata( 'user', 0, 'dismissed_wp_pointers', '', true );
</span><span class="cx">
</span><ins>+ if ( $wp_current_db_version < 19390 && is_main_site() ) {
+ update_site_option( 'initial_db_version', $wp_current_db_version );
+ // populate_options() will handle single-site.
+ }
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> if ( $wp_current_db_version >= 11548 )
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>