<!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>[19060] trunk: Introduce ->mysql to allow drop-ins to declare themselves as MySQL and therefore allow minimum version checks to still apply.</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/19060">19060</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-10-25 05:29:28 +0000 (Tue, 25 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce ->mysql to allow drop-ins to declare themselves as MySQL and therefore allow minimum version checks to still apply. fixes <a href="http://core.trac.wordpress.org/ticket/18176">#18176</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesupdatecorephp">trunk/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpadminupgradephp">trunk/wp-admin/upgrade.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update-core.php (19059 => 19060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update-core.php 2011-10-25 05:09:03 UTC (rev 19059)
+++ trunk/wp-admin/includes/update-core.php 2011-10-25 05:29:28 UTC (rev 19060)
</span><span class="lines">@@ -337,7 +337,10 @@
</span><span class="cx"> $required_mysql_version = '5.0';
</span><span class="cx"> $wp_version = '3.3';
</span><span class="cx"> $php_compat = version_compare( $php_version, $required_php_version, '>=' );
</span><del>- $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
</del><ins>+ if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $this->is_mysql ) )
+ $mysql_compat = true;
+ else
+ $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
</ins><span class="cx">
</span><span class="cx"> if ( !$mysql_compat || !$php_compat )
</span><span class="cx"> $wp_filesystem->delete($from, true);
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (19059 => 19060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2011-10-25 05:09:03 UTC (rev 19059)
+++ trunk/wp-admin/update-core.php 2011-10-25 05:29:28 UTC (rev 19060)
</span><span class="lines">@@ -44,8 +44,12 @@
</span><span class="cx"> $submit = __('Re-install Now');
</span><span class="cx"> $form_action = 'update-core.php?action=do-core-reinstall';
</span><span class="cx"> } else {
</span><del>- $php_compat = version_compare( $php_version, $update->php_version, '>=' );
- $mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
</del><ins>+ $php_compat = version_compare( $php_version, $update->php_version, '>=' );
+ if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+ $mysql_compat = true;
+ else
+ $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
+
</ins><span class="cx"> if ( !$mysql_compat && !$php_compat )
</span><span class="cx"> $message = sprintf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
</span><span class="cx"> elseif ( !$php_compat )
</span></span></pre></div>
<a id="trunkwpadminupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upgrade.php (19059 => 19060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upgrade.php 2011-10-25 05:09:03 UTC (rev 19059)
+++ trunk/wp-admin/upgrade.php 2011-10-25 05:29:28 UTC (rev 19060)
</span><span class="lines">@@ -38,7 +38,10 @@
</span><span class="cx"> $php_version = phpversion();
</span><span class="cx"> $mysql_version = $wpdb->db_version();
</span><span class="cx"> $php_compat = version_compare( $php_version, $required_php_version, '>=' );
</span><del>-$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
</del><ins>+if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+ $mysql_compat = true;
+else
+ $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
</ins><span class="cx">
</span><span class="cx"> @header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (19059 => 19060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2011-10-25 05:09:03 UTC (rev 19059)
+++ trunk/wp-includes/wp-db.php 2011-10-25 05:29:28 UTC (rev 19060)
</span><span class="lines">@@ -461,6 +461,20 @@
</span><span class="cx"> var $func_call;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Whether MySQL is used as the database engine.
+ *
+ * Set in WPDB::db_connect() to true, by default. This is used when checking
+ * against the required MySQL version for WordPress. Normally, a replacement
+ * database drop-in (db.php) will skip these checks, but setting this to true
+ * will force the checks to occur.
+ *
+ * @since 3.3.0
+ * @access public
+ * @var bool
+ */
+ public $is_mysql = null;
+
+ /**
</ins><span class="cx"> * Connects to the database server and selects a database
</span><span class="cx"> *
</span><span class="cx"> * PHP5 style constructor for compatibility with PHP5. Does
</span><span class="lines">@@ -1015,6 +1029,9 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx"> function db_connect() {
</span><ins>+
+ $this->is_mysql = true;
+
</ins><span class="cx"> if ( WP_DEBUG ) {
</span><span class="cx"> $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>