X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/f9001779751f83dc8a10e478bfecb4d8dd5f964c..fa11948979fd6a4ea5705dc613b239699a459db3:/wp-admin/options-general.php?ds=sidebyside diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 57a1b149..5f2bf21c 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -7,7 +7,7 @@ */ /** WordPress Administration Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); if ( ! current_user_can( 'manage_options' ) ) wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) ); @@ -20,10 +20,9 @@ $timezone_format = _x('Y-m-d G:i:s', 'timezone date format'); /** * Display JavaScript on the page. * - * @package WordPress - * @subpackage General_Settings_Screen + * @since 3.5.0 */ -function add_js() { +function options_general_add_js() { ?> ' . __('The fields on this screen determine some of the basics of your site setup.') . '
' . - '' . __('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.') . '
' . - '' . __('The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.') . '
' . - '' . __('If you want site visitors to be able to register themselves, as opposed to being registered by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site administrator.') . '
' . - '' . __('UTC means Coordinated Universal Time.') . '
' . - '' . __('Remember to click the Save Changes button at the bottom of the screen for new settings to take effect.') . '
' . +add_action('admin_head', 'options_general_add_js'); + +$options_help = '' . __('The fields on this screen determine some of the basics of your site setup.') . '
' . + '' . __('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.') . '
'; + +if ( ! is_multisite() ) { + $options_help .= '' . __('The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.') . '
' . + '' . __('If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin.') . '
'; +} + +$options_help .= '' . __('UTC means Coordinated Universal Time.') . '
' . + '' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '
'; + +get_current_screen()->add_help_tab( array( + 'id' => 'overview', + 'title' => __('Overview'), + 'content' => $options_help, +) ); + +get_current_screen()->set_help_sidebar( '' . __('For more information:') . '
' . - '' . __('Documentation on General Settings') . '
' . + '' . __('Documentation on General Settings') . '
' . '' . __('Support Forums') . '
' ); -include('./admin-header.php'); +include( ABSPATH . 'wp-admin/admin-header.php' ); ?>to be different from the directory you installed WordPress.'); ?>
The new address will not become active until confirmed.') ?>
%s
'), date_i18n( $time_format, false, 'gmt')); ?>
-
- %2$s'), $current_offset_name, date_i18n($time_format)); ?>
-
-%s
'), date_i18n($timezone_format, false, 'gmt')); ?>
+ UTC time is %s
'), date_i18n($timezone_format, false, 'gmt')); ?>
%1$s'), date_i18n($timezone_format)); ?>
-%s
.');
+ __('Standard time begins on: %s
.');
// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] + ($tz_offset - $tr['offset']) ) );
} else {
@@ -250,20 +223,20 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
-