WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

"Login" is a noun. The verb is "Log In" 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2008-11-20 03:23:15 +00:00
parent b6c9d89527
commit 67b3b12fa5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/general-template.php
View File

@ -121,7 +121,7 @@ function get_search_form() {
/** /**
* Display the Log In/Out link. * Display the Log In/Out link.
* *
* Displays a link, which allows the user to navigate to the Login page to login * Displays a link, which allows the user to navigate to the Log In page to log in
* or log out depending on whether or not they are currently logged in. * or log out depending on whether or not they are currently logged in.
* *
* @since 1.5.0 * @since 1.5.0

8
wp-login.php
View File

@ -25,7 +25,7 @@ if ( force_ssl_admin() && !is_ssl() ) {
/** /**
* Outputs the header for the login page. * Outputs the header for the login page.
* *
* @uses do_action() Calls the 'login_head' for outputting HTML in the Login * @uses do_action() Calls the 'login_head' for outputting HTML in the Log In
* header. * header.
* @uses apply_filters() Calls 'login_headerurl' for the top login link. * @uses apply_filters() Calls 'login_headerurl' for the top login link.
* @uses apply_filters() Calls 'login_headertitle' for the top login title. * @uses apply_filters() Calls 'login_headertitle' for the top login title.
@ -33,12 +33,12 @@ if ( force_ssl_admin() && !is_ssl() ) {
* header. * header.
* @uses $error The error global, which is checked for displaying errors. * @uses $error The error global, which is checked for displaying errors.
* *
* @param string $title Optional. WordPress Login Page title to display in * @param string $title Optional. WordPress Log In Page title to display in
* <title/> element. * <title/> element.
* @param string $message Optional. Message to display in header. * @param string $message Optional. Message to display in header.
* @param WP_Error $wp_error Optional. WordPress Error Object * @param WP_Error $wp_error Optional. WordPress Error Object
*/ */
function login_header($title = 'Login', $message = '', $wp_error = '') { function login_header($title = 'Log In', $message = '', $wp_error = '') {
global $error; global $error;
if ( empty($wp_error) ) if ( empty($wp_error) )
@ -456,7 +456,7 @@ default:
elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) $errors->add('newpass', __('Check your e-mail for your new password.'), 'message'); elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) $errors->add('newpass', __('Check your e-mail for your new password.'), 'message');
elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message'); elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message');
login_header(__('Login'), '', $errors); login_header(__('Log In'), '', $errors);
if ( isset($_POST['log']) ) if ( isset($_POST['log']) )
$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? attribute_escape(stripslashes($_POST['log'])) : ''; $user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? attribute_escape(stripslashes($_POST['log'])) : '';