<!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>[18374] trunk: wp_check_php_mysql_versions() during setup and install.</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://trac.wordpress.org/changeset/18374">18374</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-06-29 16:46:46 +0000 (Wed, 29 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>wp_check_php_mysql_versions() during setup and install. see <a href="http://trac.wordpress.org/ticket/17934">#17934</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminsetupconfigphp">trunk/wp-admin/setup-config.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwploadphp">trunk/wp-load.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/setup-config.php (18373 => 18374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/setup-config.php 2011-06-29 16:10:57 UTC (rev 18373)
+++ trunk/wp-admin/setup-config.php 2011-06-29 16:46:46 UTC (rev 18374)
</span><span class="lines">@@ -40,10 +40,12 @@
</span><span class="cx"> /**#@-*/
</span><span class="cx">
</span><span class="cx"> require_once(ABSPATH . WPINC . '/load.php');
</span><ins>+require_once(ABSPATH . WPINC . '/version.php');
+wp_check_php_mysql_versions();
+
</ins><span class="cx"> require_once(ABSPATH . WPINC . '/compat.php');
</span><span class="cx"> require_once(ABSPATH . WPINC . '/functions.php');
</span><span class="cx"> require_once(ABSPATH . WPINC . '/class-wp-error.php');
</span><del>-require_once(ABSPATH . WPINC . '/version.php');
</del><span class="cx">
</span><span class="cx"> if (!file_exists(ABSPATH . 'wp-config-sample.php'))
</span><span class="cx"> wp_die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
</span><span class="lines">@@ -58,12 +60,6 @@
</span><span class="cx"> if (file_exists(ABSPATH . '../wp-config.php') && ! file_exists(ABSPATH . '../wp-settings.php'))
</span><span class="cx"> wp_die("<p>The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>");
</span><span class="cx">
</span><del>-if ( version_compare( $required_php_version, phpversion(), '>' ) )
- wp_die( sprintf( /*WP_I18N_OLD_PHP*/'Your server is running PHP version %1$s but WordPress requires at least %2$s.'/*/WP_I18N_OLD_PHP*/, phpversion(), $required_php_version ) );
-
-if ( !extension_loaded('mysql') && !file_exists(ABSPATH . 'wp-content/db.php') )
- wp_die( /*WP_I18N_OLD_MYSQL*/'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'/*/WP_I18N_OLD_MYSQL*/ );
-
</del><span class="cx"> if (isset($_GET['step']))
</span><span class="cx"> $step = $_GET['step'];
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (18373 => 18374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2011-06-29 16:10:57 UTC (rev 18373)
+++ trunk/wp-includes/load.php 2011-06-29 16:46:46 UTC (rev 18374)
</span><span class="lines">@@ -2,6 +2,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * These functions are needed to load WordPress.
</span><span class="cx"> *
</span><ins>+ * This file must be parsable by PHP4.
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> */
</span><span class="cx">
</span><span class="lines">@@ -95,6 +97,9 @@
</span><span class="cx"> *
</span><span class="cx"> * Dies if requirements are not met.
</span><span class="cx"> *
</span><ins>+ * This function must be able to work without a complete environment set up. In wp-load.php, for
+ * example, WP_CONTENT_DIR is defined and version.php is included before this function is called.
+ *
</ins><span class="cx"> * @access private
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-load.php (18373 => 18374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-load.php 2011-06-29 16:10:57 UTC (rev 18373)
+++ trunk/wp-load.php 2011-06-29 16:46:46 UTC (rev 18374)
</span><span class="lines">@@ -41,6 +41,11 @@
</span><span class="cx"> else
</span><span class="cx"> $path = 'wp-admin/';
</span><span class="cx">
</span><ins>+ require_once( ABSPATH . '/wp-includes/load.php' );
+ require_once( ABSPATH . '/wp-includes/version.php' );
+ define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
+ wp_check_php_mysql_versions();
+
</ins><span class="cx"> // Die with an error message
</span><span class="cx"> require_once( ABSPATH . '/wp-includes/class-wp-error.php' );
</span><span class="cx"> require_once( ABSPATH . '/wp-includes/functions.php' );
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (18373 => 18374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2011-06-29 16:10:57 UTC (rev 18373)
+++ trunk/wp-settings.php 2011-06-29 16:46:46 UTC (rev 18374)
</span><span class="lines">@@ -23,6 +23,9 @@
</span><span class="cx"> // Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.
</span><span class="cx"> wp_initial_constants( );
</span><span class="cx">
</span><ins>+// Check for the required PHP version and for the MySQL extension or a database drop-in.
+wp_check_php_mysql_versions();
+
</ins><span class="cx"> // Disable magic quotes at runtime. Magic quotes are added using wpdb later in wp-settings.php.
</span><span class="cx"> set_magic_quotes_runtime( 0 );
</span><span class="cx"> @ini_set( 'magic_quotes_sybase', 0 );
</span><span class="lines">@@ -40,9 +43,6 @@
</span><span class="cx"> // Standardize $_SERVER variables across setups.
</span><span class="cx"> wp_fix_server_vars();
</span><span class="cx">
</span><del>-// Check for the required PHP version and for the MySQL extension or a database drop-in.
-wp_check_php_mysql_versions();
-
</del><span class="cx"> // Check if we have received a request due to missing favicon.ico
</span><span class="cx"> wp_favicon_request();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>