git-svn-id: http://svn.automattic.com/wordpress/trunk@13425 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
bf207bc6e6
commit
8b4e58529b
|
@ -128,7 +128,7 @@ function save_mod_rewrite_rules() {
|
||||||
$home_path = get_home_path();
|
$home_path = get_home_path();
|
||||||
$htaccess_file = $home_path.'.htaccess';
|
$htaccess_file = $home_path.'.htaccess';
|
||||||
|
|
||||||
// If the file doesn't already exists check for write access to the directory and whether we have some rules.
|
// If the file doesn't already exist check for write access to the directory and whether we have some rules.
|
||||||
// else check for write access to the file.
|
// else check for write access to the file.
|
||||||
if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
|
if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
|
||||||
if ( got_mod_rewrite() ) {
|
if ( got_mod_rewrite() ) {
|
||||||
|
|
|
@ -1822,7 +1822,7 @@ function user_row( $user_object, $style = '', $role = '' ) {
|
||||||
// Check if the user for this row is editable
|
// Check if the user for this row is editable
|
||||||
if ( current_user_can( 'edit_user', $user_object->ID ) ) {
|
if ( current_user_can( 'edit_user', $user_object->ID ) ) {
|
||||||
// Set up the user editing link
|
// Set up the user editing link
|
||||||
// TODO: make profile/user-edit determination a seperate function
|
// TODO: make profile/user-edit determination a separate function
|
||||||
if ($current_user->ID == $user_object->ID) {
|
if ($current_user->ID == $user_object->ID) {
|
||||||
$edit_link = 'profile.php';
|
$edit_link = 'profile.php';
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -143,7 +143,7 @@ foreach ( $offset_range as $offset ) {
|
||||||
<span id="local-time"><?php printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, date_i18n($time_format)); ?></span>
|
<span id="local-time"><?php printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, date_i18n($time_format)); ?></span>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<br />
|
<br />
|
||||||
<span class="description"><?php _e('Unfortunately, you have to manually update this for Daylight Savings Time. Lame, we know, but will be fixed in the future.'); ?></span>
|
<span class="description"><?php _e('Unfortunately, you have to manually update this for daylight saving time. Lame, we know, but will be fixed in the future.'); ?></span>
|
||||||
</td>
|
</td>
|
||||||
<?php
|
<?php
|
||||||
else: // looks like we can do nice timezone selection!
|
else: // looks like we can do nice timezone selection!
|
||||||
|
@ -185,7 +185,7 @@ if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
|
||||||
<?php if ($check_zone_info && $tzstring) : ?>
|
<?php if ($check_zone_info && $tzstring) : ?>
|
||||||
<?php
|
<?php
|
||||||
$now = localtime(time(),true);
|
$now = localtime(time(),true);
|
||||||
if ($now['tm_isdst']) _e('This timezone is currently in daylight savings time.');
|
if ($now['tm_isdst']) _e('This timezone is currently in daylight saving time.');
|
||||||
else _e('This timezone is currently in standard time.');
|
else _e('This timezone is currently in standard time.');
|
||||||
?>
|
?>
|
||||||
<br />
|
<br />
|
||||||
|
@ -202,11 +202,11 @@ if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
|
||||||
if ( isset($found) && $found === true ) {
|
if ( isset($found) && $found === true ) {
|
||||||
echo ' ';
|
echo ' ';
|
||||||
$message = $tr['isdst'] ?
|
$message = $tr['isdst'] ?
|
||||||
__('Daylight savings time begins on: <code>%s</code>.') :
|
__('Daylight saving time begins on: <code>%s</code>.') :
|
||||||
__('Standard time begins on: <code>%s</code>.');
|
__('Standard time begins on: <code>%s</code>.');
|
||||||
printf( $message, date_i18n(get_option('date_format').' '.get_option('time_format'), $tr['ts'] ) );
|
printf( $message, date_i18n(get_option('date_format').' '.get_option('time_format'), $tr['ts'] ) );
|
||||||
} else {
|
} else {
|
||||||
_e('This timezone does not observe daylight savings time.');
|
_e('This timezone does not observe daylight saving time.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -265,7 +265,7 @@ class SMTP
|
||||||
* finializing the mail transaction. $msg_data is the message
|
* finializing the mail transaction. $msg_data is the message
|
||||||
* that is to be send with the headers. Each header needs to be
|
* that is to be send with the headers. Each header needs to be
|
||||||
* on a single line followed by a <CRLF> with the message headers
|
* on a single line followed by a <CRLF> with the message headers
|
||||||
* and the message body being seperated by and additional <CRLF>.
|
* and the message body being separated by and additional <CRLF>.
|
||||||
*
|
*
|
||||||
* Implements rfc 821: DATA <CRLF>
|
* Implements rfc 821: DATA <CRLF>
|
||||||
*
|
*
|
||||||
|
|
|
@ -922,7 +922,7 @@ class Walker {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* need to display in hierarchical order
|
* need to display in hierarchical order
|
||||||
* seperate elements into two buckets: top level and children elements
|
* separate elements into two buckets: top level and children elements
|
||||||
* children_elements is two dimensional array, eg.
|
* children_elements is two dimensional array, eg.
|
||||||
* children_elements[10][] contains all sub-elements whose parent is 10.
|
* children_elements[10][] contains all sub-elements whose parent is 10.
|
||||||
*/
|
*/
|
||||||
|
@ -1036,7 +1036,7 @@ class Walker {
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* seperate elements into two buckets: top level and children elements
|
* separate elements into two buckets: top level and children elements
|
||||||
* children_elements is two dimensional array, eg.
|
* children_elements is two dimensional array, eg.
|
||||||
* children_elements[10][] contains all sub-elements whose parent is 10.
|
* children_elements[10][] contains all sub-elements whose parent is 10.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1255,7 +1255,7 @@ function gzip_compression() {
|
||||||
* @see get_comment()
|
* @see get_comment()
|
||||||
*
|
*
|
||||||
* @param int $comment_ID The ID of the comment
|
* @param int $comment_ID The ID of the comment
|
||||||
* @param int $no_cache Whether to use the cache (casted to bool)
|
* @param int $no_cache Whether to use the cache (cast to bool)
|
||||||
* @param bool $include_unapproved Whether to include unapproved comments
|
* @param bool $include_unapproved Whether to include unapproved comments
|
||||||
* @return array The comment data
|
* @return array The comment data
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -167,7 +167,7 @@ function get_search_form($echo = true) {
|
||||||
/**
|
/**
|
||||||
* Display the Log In/Out link.
|
* Display the Log In/Out link.
|
||||||
*
|
*
|
||||||
* Displays a link, which allows the user to navigate to the Log In page to log in
|
* Displays a link, which allows users to navigate to the Log In page to log in
|
||||||
* or log out depending on whether they are currently logged in.
|
* or log out depending on whether they are currently logged in.
|
||||||
*
|
*
|
||||||
* @since 1.5.0
|
* @since 1.5.0
|
||||||
|
|
|
@ -228,7 +228,7 @@ function timer_stop( $display = 0, $precision = 3 ) { // if called like timer_st
|
||||||
* defined in wp-config.php. Example: <code> define( 'WP_DEBUG', true ); </code>
|
* defined in wp-config.php. Example: <code> define( 'WP_DEBUG', true ); </code>
|
||||||
*
|
*
|
||||||
* WP_DEBUG_DISPLAY and WP_DEBUG_LOG perform no function unless WP_DEBUG is true.
|
* WP_DEBUG_DISPLAY and WP_DEBUG_LOG perform no function unless WP_DEBUG is true.
|
||||||
* WP_DEBUG defaults defaults to false.
|
* WP_DEBUG defaults to false.
|
||||||
*
|
*
|
||||||
* When WP_DEBUG is true, all PHP notices are reported. WordPress will also display
|
* When WP_DEBUG is true, all PHP notices are reported. WordPress will also display
|
||||||
* notices, including one when a deprecated WordPress function, function argument,
|
* notices, including one when a deprecated WordPress function, function argument,
|
||||||
|
|
|
@ -1006,7 +1006,7 @@ function get_the_password_form() {
|
||||||
* Whether currently in a page template.
|
* Whether currently in a page template.
|
||||||
*
|
*
|
||||||
* This template tag allows you to determine if you are in a page template.
|
* This template tag allows you to determine if you are in a page template.
|
||||||
* You can optional provide a template name and then the check will be
|
* You can optionally provide a template name and then the check will be
|
||||||
* specific to that template.
|
* specific to that template.
|
||||||
*
|
*
|
||||||
* @since 2.5.0
|
* @since 2.5.0
|
||||||
|
|
Loading…
Reference in New Issue