Make WordPress Core

Changeset 4144 for trunk/wp-login.php


Ignore:
Timestamp:
08/30/2006 09:46:31 PM (18 years ago)
Author:
ryan
Message:

Use get_option instead of get_settings. Just 'cause.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-login.php

    r4143 r4144  
    1717
    1818    $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
    19     if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') )
     19    if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') )
    2020        update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
    2121}
     
    4646    <title>WordPress &raquo; <?php _e('Lost Password') ?></title>
    4747    <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
    48     <link rel="stylesheet" href="<?php echo get_settings('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
     48    <link rel="stylesheet" href="<?php echo get_option('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
    4949    <script type="text/javascript">
    5050    function focusit() {
     
    8181<ul>
    8282    <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
    83 <?php if (get_settings('users_can_register')) : ?>
     83<?php if (get_option('users_can_register')) : ?>
    8484    <li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
    8585<?php endif; ?>
     
    112112    $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
    113113    $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
    114     $message .= get_settings('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
    115 
    116     $m = wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_settings('blogname')), $message);
     114    $message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
     115
     116    $m = wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message);
    117117
    118118    if ($m == false) {
     
    146146    $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
    147147    $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
    148     $message .= get_settings('siteurl') . "/wp-login.php\r\n";
    149 
    150     $m = wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_settings('blogname')), $message);
     148    $message .= get_option('siteurl') . "/wp-login.php\r\n";
     149
     150    $m = wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message);
    151151
    152152    if ($m == false) {
     
    159159        // send a copy of password change notification to the admin
    160160        $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
    161         wp_mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_settings('blogname')), $message);
     161        wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
    162162        die();
    163163    }
     
    196196        // If the user can't edit posts, send them to their profile.
    197197        if ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' ) )
    198             $redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
     198            $redirect_to = get_option('siteurl') . '/wp-admin/profile.php';
    199199
    200200        if ( wp_login($user_login, $user_pass, $using_cookie) ) {
     
    247247<ul>
    248248    <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
    249 <?php if (get_settings('users_can_register')) : ?>
     249<?php if (get_option('users_can_register')) : ?>
    250250    <li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
    251251<?php endif; ?>
Note: See TracChangeset for help on using the changeset viewer.