Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 09:07:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix syntax for single- and multi-line comments in root-directory files.

Browse Source 
See #28931.

Built from https://develop.svn.wordpress.org/trunk@29205


git-svn-id: http://core.svn.wordpress.org/trunk@28989 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2014-07-17 09:12:16 +00:00
parent b7445ec8a4
commit e731028303
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-login.php
View File

@ -69,9 +69,11 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
wp_admin_css( 'login', true ); wp_admin_css( 'login', true );
// Remove all stored post data on logging out. /*
// This could be added by add_action('login_head'...) like wp_shake_js() * Remove all stored post data on logging out.
// but maybe better if it's not removable by plugins * This could be added by add_action('login_head'...) like wp_shake_js(),
* but maybe better if it's not removable by plugins
*/
if ( 'loggedout' == $wp_error->get_error_code() ) { if ( 'loggedout' == $wp_error->get_error_code() ) {
?> ?>
<script>if("sessionStorage" in window){try{for(var key in sessionStorage){if(key.indexOf("wp-autosave-")!=-1){sessionStorage.removeItem(key)}}}catch(e){}};</script> <script>if("sessionStorage" in window){try{for(var key in sessionStorage){if(key.indexOf("wp-autosave-")!=-1){sessionStorage.removeItem(key)}}}catch(e){}};</script>
@ -296,7 +298,7 @@ function retrieve_password() {
return $errors; return $errors;
} }
// redefining user_login ensures we return the right case in the email // Redefining user_login ensures we return the right case in the email.
$user_login = $user_data->user_login; $user_login = $user_data->user_login;
$user_email = $user_data->user_email; $user_email = $user_data->user_email;
@ -309,6 +311,7 @@ function retrieve_password() {
* @param string $user_login The user login name. * @param string $user_login The user login name.
*/ */
do_action( 'retreive_password', $user_login ); do_action( 'retreive_password', $user_login );
/** /**
* Fires before a new password is retrieved. * Fires before a new password is retrieved.
* *
@ -364,8 +367,10 @@ function retrieve_password() {
if ( is_multisite() ) if ( is_multisite() )
$blogname = $GLOBALS['current_site']->site_name; $blogname = $GLOBALS['current_site']->site_name;
else else
// The blogname option is escaped with esc_html on the way into the database in sanitize_option /*
// we want to reverse this for the plain text arena of emails. * The blogname option is escaped with esc_html on the way into the database
* in sanitize_option we want to reverse this for the plain text arena of emails.
*/
$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
$title = sprintf( __('[%s] Password Reset'), $blogname ); $title = sprintf( __('[%s] Password Reset'), $blogname );

11
wp-mail.php
View File

@ -68,7 +68,7 @@ for ( $i = 1; $i <= $count; $i++ ) {
$author_found = false; $author_found = false;
$dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'); $dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
foreach ($message as $line) { foreach ($message as $line) {
// body signal // Body signal.
if ( strlen($line) < 3 ) if ( strlen($line) < 3 )
$bodysignal = true; $bodysignal = true;
if ( $bodysignal ) { if ( $bodysignal ) {
@ -108,8 +108,10 @@ for ( $i = 1; $i <= $count; $i++ ) {
$subject = $subject[0]; $subject = $subject[0];
} }
// Set the author using the email address (From or Reply-To, the last used) /*
// otherwise use the site admin * Set the author using the email address (From or Reply-To, the last used)
* otherwise use the site admin.
*/
if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) { if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) {
if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) ) if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) )
$author = $matches[0]; $author = $matches[0];
@ -171,7 +173,8 @@ for ( $i = 1; $i <= $count; $i++ ) {
if ( $content_type == 'multipart/alternative' ) { if ( $content_type == 'multipart/alternative' ) {
$content = explode('--'.$boundary, $content); $content = explode('--'.$boundary, $content);
$content = $content[2]; $content = $content[2];
// match case-insensitive content-transfer-encoding
// Match case-insensitive content-transfer-encoding.
if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim) ) { if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim) ) {
$content = explode($delim[0], $content); $content = explode($delim[0], $content);
$content = $content[1]; $content = $content[1];

2
wp-signup.php
View File

@ -316,7 +316,7 @@ function validate_another_blog_signup() {
$result = validate_blog_form(); $result = validate_blog_form();
// extracted values set/overwrite globals // Extracted values set/overwrite globals.
$domain = $result['domain']; $domain = $result['domain'];
$path = $result['path']; $path = $result['path'];
$blogname = $result['blogname']; $blogname = $result['blogname'];