Ticket #21316: 21316.6.patch
| File 21316.6.patch, 6.5 KB (added by , 14 years ago) |
|---|
-
wp-admin/index.php
2 2 /** 3 3 * Dashboard Administration Screen 4 4 * 5 * @internal This file must be parsable by PHP4. 6 * 5 7 * @package WordPress 6 8 * @subpackage Administration 7 9 */ … … 32 34 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 $current_screen = get_current_screen(); 38 $current_screen->add_help_tab( array( 36 39 'id' => 'overview', 37 40 'title' => __( 'Overview' ), 38 41 'content' => $help, … … 43 46 $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>'; 44 47 $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 48 46 get_current_screen()->add_help_tab( array(49 $current_screen->add_help_tab( array( 47 50 'id' => 'help-navigation', 48 51 'title' => __('Navigation'), 49 52 'content' => $help, … … 54 57 $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>'; 55 58 $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 59 57 get_current_screen()->add_help_tab( array(60 $current_screen->add_help_tab( array( 58 61 'id' => 'help-layout', 59 62 'title' => __('Layout'), 60 63 'content' => $help, … … 78 81 if ( current_user_can( 'edit_theme_options' ) ) 79 82 $help .= '<p>' . __('<strong>Welcome</strong> - Shows links for some of the most common tasks when setting up a new site.') . '</p>'; 80 83 81 get_current_screen()->add_help_tab( array(84 $current_screen->add_help_tab( array( 82 85 'id' => 'help-content', 83 86 'title' => __('Content'), 84 87 'content' => $help, … … 86 89 87 90 unset( $help ); 88 91 89 get_current_screen()->set_help_sidebar(92 $current_screen->set_help_sidebar( 90 93 '<p><strong>' . __( 'For more information:' ) . '</strong></p>' . 91 94 '<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>' . 92 95 '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>' -
wp-admin/setup-config.php
54 54 wp_unregister_GLOBALS(); 55 55 56 56 require_once(ABSPATH . WPINC . '/compat.php'); 57 require_once(ABSPATH . WPINC . '/functions.php'); 57 58 require_once(ABSPATH . WPINC . '/class-wp-error.php'); 58 59 require_once(ABSPATH . WPINC . '/formatting.php'); 59 60 … … 217 218 } 218 219 219 220 $key = 0; 220 foreach ( $config_file as &$line ) {221 foreach ( $config_file as $line_num => $line ) { 221 222 if ( '$table_prefix =' == substr( $line, 0, 16 ) ) { 222 $ line= '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";223 $config_file[ $line_num ] = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n"; 223 224 continue; 224 225 } 225 226 … … 234 235 case 'DB_USER' : 235 236 case 'DB_PASSWORD' : 236 237 case 'DB_HOST' : 237 $ line= "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";238 $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n"; 238 239 break; 239 240 case 'AUTH_KEY' : 240 241 case 'SECURE_AUTH_KEY' : … … 244 245 case 'SECURE_AUTH_SALT' : 245 246 case 'LOGGED_IN_SALT' : 246 247 case 'NONCE_SALT' : 247 $ line = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";248 $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[ $key++ ] . "');\r\n"; 248 249 break; 249 250 } 250 251 } -
wp-includes/load.php
105 105 $php_version = phpversion(); 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 } 116 116 … … 685 685 require_once ABSPATH . WPINC . '/locale.php'; 686 686 687 687 // General libraries 688 require_once ABSPATH . WPINC . '/functions.php';689 688 require_once ABSPATH . WPINC . '/plugin.php'; 690 689 691 690 $locales = $locations = array(); -
wp-load.php
52 52 wp_check_php_mysql_versions(); 53 53 54 54 // Die with an error message 55 require_once( ABSPATH . WPINC . '/functions.php' ); 55 56 $die = __( "There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started." ) . '</p>'; 56 57 $die .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>'; 57 58 $die .= '<p>' . __( "You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ) . '</p>';