Changeset 21716

Timestamp:

09/04/2012 02:46:01 AM (12 years ago)

Author:

nacin

Message:

setup-config.php must be parseable by PHP4 so we can show a sane error message. wp-admin/index.php should ideally be as well. props SergeyBiryukov, see #21316.

Location:

trunk/wp-admin

Files:

• index.php (modified) (6 diffs)
• setup-config.php (modified) (3 diffs)

trunk/wp-admin/index.php

@@ -2 +2 @@
 /**
  * Dashboard Administration Screen
+ *
+ * @internal This file should be parseable by PHP4.
  *
  * @package WordPress
@@ -33 +35 @@
 $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>';
 
-get_current_screen()->add_help_tab( array(
+// Not using chaining here, so as to be parseable by PHP4.
+$screen = get_current_screen();
+
+$screen->add_help_tab( array(
     'id'      => 'overview',
     'title'   => __( 'Overview' ),
@@ -44 +49 @@
 $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>';
 
-get_current_screen()->add_help_tab( array(
+$screen->add_help_tab( array(
     'id'      => 'help-navigation',
     'title'   => __('Navigation'),
@@ -55 +60 @@
 $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>';
 
-get_current_screen()->add_help_tab( array(
+$screen->add_help_tab( array(
     'id'      => 'help-layout',
     'title'   => __('Layout'),
@@ -79 +84 @@
     $help .= '<p>' . __('<strong>Welcome</strong> - Shows links for some of the most common tasks when setting up a new site.') . '</p>';
 
-get_current_screen()->add_help_tab( array(
+$screen->add_help_tab( array(
     'id'      => 'help-content',
     'title'   => __('Content'),
@@ -87 +92 @@
 unset( $help );
 
-get_current_screen()->set_help_sidebar(
+$screen->set_help_sidebar(
     '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
     '<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>' .

trunk/wp-admin/setup-config.php

@@ -220 +220 @@
 
     $key = 0;
-    foreach ( $config_file as &$line ) {
+    // Not a PHP5-style by-reference foreach, as this file must be parseable by PHP4.
+    foreach ( $config_file as $line_num => $line ) {
         if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
-            $line = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
+            $config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
             continue;
         }
@@ -237 +238 @@
             case 'DB_PASSWORD' :
             case 'DB_HOST'     :
-                $line = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";
+                $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";
                 break;
             case 'AUTH_KEY'         :
@@ -247 +248 @@
             case 'LOGGED_IN_SALT'   :
             case 'NONCE_SALT'       :
-                $line = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
+                $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
                 break;
         }