<!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>[21739] branches/3.4: Ensure we are parseable by PHP4 until wp_check_php_mysql_versions() has a chance to run.</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/21739">21739</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-04 20:31:14 +0000 (Tue, 04 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure we are parseable by PHP4 until wp_check_php_mysql_versions() has a chance to run.
Merges <a href="http://core.trac.wordpress.org/changeset/21715">[21715]</a>, <a href="http://core.trac.wordpress.org/changeset/21716">[21716]</a> to the 3.4 branch.
props SergeyBiryukov.
fixes <a href="http://core.trac.wordpress.org/ticket/21316">#21316</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches34wpadminindexphp">branches/3.4/wp-admin/index.php</a></li>
<li><a href="#branches34wpadminsetupconfigphp">branches/3.4/wp-admin/setup-config.php</a></li>
<li><a href="#branches34wpincludesloadphp">branches/3.4/wp-includes/load.php</a></li>
<li><a href="#branches34wploadphp">branches/3.4/wp-load.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches34wpadminindexphp"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-admin/index.php (21738 => 21739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-admin/index.php 2012-09-04 20:28:52 UTC (rev 21738)
+++ branches/3.4/wp-admin/index.php 2012-09-04 20:31:14 UTC (rev 21739)
</span><span class="lines">@@ -2,6 +2,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Dashboard Administration Screen
</span><span class="cx"> *
</span><ins>+ * @internal This file should be parseable by PHP4.
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><span class="lines">@@ -32,7 +34,10 @@
</span><span class="cx">
</span><span class="cx"> $help = '<p>' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner.' ) . '</p>';
</span><span class="cx">
</span><del>-get_current_screen()->add_help_tab( array(
</del><ins>+// Not using chaining here, so as to be parseable by PHP4.
+$screen = get_current_screen();
+
+$screen->add_help_tab( array(
</ins><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __( 'Overview' ),
</span><span class="cx"> 'content' => $help,
</span><span class="lines">@@ -43,7 +48,7 @@
</span><span class="cx"> $help = '<p>' . __('The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.') . '</p>';
</span><span class="cx">
</span><del>-get_current_screen()->add_help_tab( array(
</del><ins>+$screen->add_help_tab( array(
</ins><span class="cx"> 'id' => 'help-navigation',
</span><span class="cx"> 'title' => __('Navigation'),
</span><span class="cx"> 'content' => $help,
</span><span class="lines">@@ -54,7 +59,7 @@
</span><span class="cx"> $help .= '<p>' . __('<strong>Drag and Drop</strong> - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('<strong>Box Controls</strong> - Click the title bar of the box to expand or collapse it. In addition, some box have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.') . '</p>';
</span><span class="cx">
</span><del>-get_current_screen()->add_help_tab( array(
</del><ins>+$screen->add_help_tab( array(
</ins><span class="cx"> 'id' => 'help-layout',
</span><span class="cx"> 'title' => __('Layout'),
</span><span class="cx"> 'content' => $help,
</span><span class="lines">@@ -78,7 +83,7 @@
</span><span class="cx"> if ( current_user_can( 'edit_theme_options' ) )
</span><span class="cx"> $help .= '<p>' . __('<strong>Welcome</strong> - Shows links for some of the most common tasks when setting up a new site.') . '</p>';
</span><span class="cx">
</span><del>-get_current_screen()->add_help_tab( array(
</del><ins>+$screen->add_help_tab( array(
</ins><span class="cx"> 'id' => 'help-content',
</span><span class="cx"> 'title' => __('Content'),
</span><span class="cx"> 'content' => $help,
</span><span class="lines">@@ -86,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> unset( $help );
</span><span class="cx">
</span><del>-get_current_screen()->set_help_sidebar(
</del><ins>+$screen->set_help_sidebar(
</ins><span class="cx"> '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
</span><span class="cx"> '<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>' .
</span><span class="cx"> '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
</span></span></pre></div>
<a id="branches34wpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-admin/setup-config.php (21738 => 21739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-admin/setup-config.php 2012-09-04 20:28:52 UTC (rev 21738)
+++ branches/3.4/wp-admin/setup-config.php 2012-09-04 20:31:14 UTC (rev 21739)
</span><span class="lines">@@ -44,12 +44,14 @@
</span><span class="cx"> require(ABSPATH . WPINC . '/load.php');
</span><span class="cx"> require(ABSPATH . WPINC . '/version.php');
</span><span class="cx">
</span><del>-// Also loads functions.php, plugin.php, l10n.php, pomo/mo.php (all required by setup-config.php)
-wp_load_translations_early();
-
</del><span class="cx"> // Check for the required PHP version and for the MySQL extension or a database drop-in.
</span><span class="cx"> wp_check_php_mysql_versions();
</span><span class="cx">
</span><ins>+require_once(ABSPATH . WPINC . '/functions.php');
+
+// Also loads plugin.php, l10n.php, pomo/mo.php (all required by setup-config.php)
+wp_load_translations_early();
+
</ins><span class="cx"> // Turn register_globals off.
</span><span class="cx"> wp_unregister_GLOBALS();
</span><span class="cx">
</span><span class="lines">@@ -217,9 +219,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $key = 0;
</span><del>- foreach ( $config_file as &$line ) {
</del><ins>+ // Not a PHP5-style by-reference foreach, as this file must be parseable by PHP4.
+ foreach ( $config_file as $line_num => $line ) {
</ins><span class="cx"> if ( '$table_prefix =' == substr( $line, 0, 16 ) ) {
</span><del>- $line = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
</del><ins>+ $config_file[ $line_num ] = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -234,7 +237,7 @@
</span><span class="cx"> case 'DB_USER' :
</span><span class="cx"> case 'DB_PASSWORD' :
</span><span class="cx"> case 'DB_HOST' :
</span><del>- $line = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";
</del><ins>+ $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";
</ins><span class="cx"> break;
</span><span class="cx"> case 'AUTH_KEY' :
</span><span class="cx"> case 'SECURE_AUTH_KEY' :
</span><span class="lines">@@ -244,7 +247,7 @@
</span><span class="cx"> case 'SECURE_AUTH_SALT' :
</span><span class="cx"> case 'LOGGED_IN_SALT' :
</span><span class="cx"> case 'NONCE_SALT' :
</span><del>- $line = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
</del><ins>+ $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches34wpincludesloadphp"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-includes/load.php (21738 => 21739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-includes/load.php 2012-09-04 20:28:52 UTC (rev 21738)
+++ branches/3.4/wp-includes/load.php 2012-09-04 20:31:14 UTC (rev 21739)
</span><span class="lines">@@ -105,12 +105,12 @@
</span><span class="cx"> $php_version = phpversion();
</span><span class="cx"> if ( version_compare( $required_php_version, $php_version, '>' ) ) {
</span><span class="cx"> wp_load_translations_early();
</span><del>- wp_die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
</del><ins>+ die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! extension_loaded( 'mysql' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
</span><span class="cx"> wp_load_translations_early();
</span><del>- wp_die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
</del><ins>+ die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -685,7 +685,6 @@
</span><span class="cx"> require_once ABSPATH . WPINC . '/locale.php';
</span><span class="cx">
</span><span class="cx"> // General libraries
</span><del>- require_once ABSPATH . WPINC . '/functions.php';
</del><span class="cx"> require_once ABSPATH . WPINC . '/plugin.php';
</span><span class="cx">
</span><span class="cx"> $locales = $locations = array();
</span></span></pre></div>
<a id="branches34wploadphp"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-load.php (21738 => 21739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-load.php 2012-09-04 20:28:52 UTC (rev 21738)
+++ branches/3.4/wp-load.php 2012-09-04 20:31:14 UTC (rev 21739)
</span><span class="lines">@@ -48,9 +48,11 @@
</span><span class="cx"> require_once( ABSPATH . WPINC . '/load.php' );
</span><span class="cx"> require_once( ABSPATH . WPINC . '/version.php' );
</span><span class="cx">
</span><ins>+ wp_check_php_mysql_versions();
</ins><span class="cx"> wp_load_translations_early();
</span><del>- wp_check_php_mysql_versions();
</del><span class="cx">
</span><ins>+ require_once( ABSPATH . WPINC . '/functions.php' );
+
</ins><span class="cx"> // Die with an error message
</span><span class="cx"> $die = __( "There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started." ) . '</p>';
</span><span class="cx"> $die .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';
</span></span></pre>
</div>
</div>
</body>
</html>