Changeset 21739
- Timestamp:
- 09/04/2012 08:31:14 PM (12 years ago)
- Location:
- branches/3.4
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.4/wp-admin/index.php
r20715 r21739 2 2 /** 3 3 * Dashboard Administration Screen 4 * 5 * @internal This file should be parseable by PHP4. 4 6 * 5 7 * @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>'; 34 36 35 get_current_screen()->add_help_tab( array( 37 // Not using chaining here, so as to be parseable by PHP4. 38 $screen = get_current_screen(); 39 40 $screen->add_help_tab( array( 36 41 'id' => 'overview', 37 42 '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>'; 45 50 46 get_current_screen()->add_help_tab( array(51 $screen->add_help_tab( array( 47 52 'id' => 'help-navigation', 48 53 '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 “Configure” link in the title bar if you hover over it.') . '</p>'; 56 61 57 get_current_screen()->add_help_tab( array(62 $screen->add_help_tab( array( 58 63 'id' => 'help-layout', 59 64 '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>'; 80 85 81 get_current_screen()->add_help_tab( array(86 $screen->add_help_tab( array( 82 87 'id' => 'help-content', 83 88 'title' => __('Content'), … … 87 92 unset( $help ); 88 93 89 get_current_screen()->set_help_sidebar(94 $screen->set_help_sidebar( 90 95 '<p><strong>' . __( 'For more information:' ) . '</strong></p>' . 91 96 '<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>' . -
branches/3.4/wp-admin/setup-config.php
r20661 r21739 45 45 require(ABSPATH . WPINC . '/version.php'); 46 46 47 // Also loads functions.php, plugin.php, l10n.php, pomo/mo.php (all required by setup-config.php)48 wp_load_translations_early();49 50 47 // Check for the required PHP version and for the MySQL extension or a database drop-in. 51 48 wp_check_php_mysql_versions(); 49 50 require_once(ABSPATH . WPINC . '/functions.php'); 51 52 // Also loads plugin.php, l10n.php, pomo/mo.php (all required by setup-config.php) 53 wp_load_translations_early(); 52 54 53 55 // Turn register_globals off. … … 218 220 219 221 $key = 0; 220 foreach ( $config_file as &$line ) { 222 // Not a PHP5-style by-reference foreach, as this file must be parseable by PHP4. 223 foreach ( $config_file as $line_num => $line ) { 221 224 if ( '$table_prefix =' == substr( $line, 0, 16 ) ) { 222 $ line= '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";225 $config_file[ $line_num ] = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n"; 223 226 continue; 224 227 } … … 235 238 case 'DB_PASSWORD' : 236 239 case 'DB_HOST' : 237 $ line= "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";240 $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n"; 238 241 break; 239 242 case 'AUTH_KEY' : … … 245 248 case 'LOGGED_IN_SALT' : 246 249 case 'NONCE_SALT' : 247 $ line= "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";250 $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n"; 248 251 break; 249 252 } -
branches/3.4/wp-includes/load.php
r19862 r21739 106 106 if ( version_compare( $required_php_version, $php_version, '>' ) ) { 107 107 wp_load_translations_early(); 108 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 ) );108 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 ) ); 109 109 } 110 110 111 111 if ( ! extension_loaded( 'mysql' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) { 112 112 wp_load_translations_early(); 113 wp_die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );113 die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) ); 114 114 } 115 115 } … … 686 686 687 687 // General libraries 688 require_once ABSPATH . WPINC . '/functions.php';689 688 require_once ABSPATH . WPINC . '/plugin.php'; 690 689 -
branches/3.4/wp-load.php
r20561 r21739 49 49 require_once( ABSPATH . WPINC . '/version.php' ); 50 50 51 wp_check_php_mysql_versions(); 51 52 wp_load_translations_early(); 52 wp_check_php_mysql_versions(); 53 54 require_once( ABSPATH . WPINC . '/functions.php' ); 53 55 54 56 // Die with an error message
Note: See TracChangeset
for help on using the changeset viewer.