WordPress 3.7.2-scripts

[autoinstalls/wordpress.git] / wp-admin / options-general.php

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index d8a8b805ff96e414a9ee7d0196f3e6eb9e368b13..5f2bf21ce866217b459cf2cfd3bbb9b51a9a01ee 100644 (file)
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -7,7 +7,7 @@
  */
 
 /** WordPress Administration Bootstrap */
  */
 
 /** 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.' ) );
 
 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.
  *
 /**
  * Display JavaScript on the page.
  *

- * @package WordPress
- * @subpackage General_Settings_Screen
+ * @since 3.5.0

  */
  */

-function add_js() {
+function options_general_add_js() {

 ?>
 <script type="text/javascript">
 //<![CDATA[
 ?>
 <script type="text/javascript">
 //<![CDATA[


@@ -45,18 +44,18 @@ function add_js() {
                });
                $("input[name='date_format_custom'], input[name='time_format_custom']").change( function() {
                        var format = $(this);
                });
                $("input[name='date_format_custom'], input[name='time_format_custom']").change( function() {
                        var format = $(this);

-                       format.siblings('img').css('visibility','visible');
+                       format.siblings('.spinner').css('display', 'inline-block'); // show(); can't be used here

                        $.post(ajaxurl, {
                                        action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
                                        date : format.val()
                        $.post(ajaxurl, {
                                        action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
                                        date : format.val()

-                               }, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );
+                               }, function(d) { format.siblings('.spinner').hide(); format.siblings('.example').text(d); } );

                });
        });
 //]]>
 </script>
 <?php
 }
                });
        });
 //]]>
 </script>
 <?php
 }

-add_action('admin_head', 'add_js');
+add_action('admin_head', 'options_general_add_js');

 
 $options_help = '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
        '<p>' . __('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.') . '</p>';
 
 $options_help = '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
        '<p>' . __('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.') . '</p>';


@@ -81,7 +80,7 @@ get_current_screen()->set_help_sidebar(
        '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
        '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 

-include('./admin-header.php');
+include( ABSPATH . 'wp-admin/admin-header.php' );

 ?>
 
 <div class="wrap">
 ?>
 
 <div class="wrap">


@@ -230,13 +229,14 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 <td>
        <fieldset><legend class="screen-reader-text"><span><?php _e('Date Format') ?></span></legend>
 <?php
 <td>
        <fieldset><legend class="screen-reader-text"><span><?php _e('Date Format') ?></span></legend>
 <?php

-
-       $date_formats = apply_filters( 'date_formats', array(
-               __('F j, Y'),
-               'Y/m/d',
-               'm/d/Y',
-               'd/m/Y',
-       ) );
+       /**
+       * Filter the default date formats.
+       *
+       * @since 2.7.0
+       *
+       * @param array $default_date_formats Array of default date formats.
+       */
+       $date_formats = array_unique( apply_filters( 'date_formats', array( __( 'F j, Y' ), 'Y/m/d', 'm/d/Y', 'd/m/Y' ) ) );

 
        $custom = true;
 
 
        $custom = true;
 


@@ -251,7 +251,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 
        echo '  <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
        checked( $custom );
 
        echo '  <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
        checked( $custom );

-       echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . esc_attr( get_option('date_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('date_format') ) . "</span> <img class='ajax-loading' src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' />\n";
+       echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . esc_attr( get_option('date_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('date_format') ) . "</span> <span class='spinner'></span>\n";

 
        echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
 ?>
 
        echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
 ?>


@@ -263,12 +263,14 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 <td>
        <fieldset><legend class="screen-reader-text"><span><?php _e('Time Format') ?></span></legend>
 <?php
 <td>
        <fieldset><legend class="screen-reader-text"><span><?php _e('Time Format') ?></span></legend>
 <?php

-
-       $time_formats = apply_filters( 'time_formats', array(
-               __('g:i a'),
-               'g:i A',
-               'H:i',
-       ) );
+       /**
+       * Filter the default time formats.
+       *
+       * @since 2.7.0
+       *
+       * @param array $default_time_formats Array of default time formats.
+       */
+       $time_formats = array_unique( apply_filters( 'time_formats', array( __( 'g:i a' ), 'g:i A', 'H:i' ) ) );

 
        $custom = true;
 
 
        $custom = true;
 


@@ -283,7 +285,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 
        echo '  <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
        checked( $custom );
 
        echo '  <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
        checked( $custom );

-       echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . esc_attr( get_option('time_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('time_format') ) . "</span> <img class='ajax-loading' src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' />\n";
+       echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . esc_attr( get_option('time_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('time_format') ) . "</span> <span class='spinner'></span>\n";

        ;
 ?>
        </fieldset>
        ;
 ?>
        </fieldset>


@@ -325,4 +327,4 @@ endfor;
 
 </div>
 
 
 </div>
 

-<?php include('./admin-footer.php') ?>
+<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>