Changeset 4144 for trunk/wp-login.php

Timestamp:

08/30/2006 09:46:31 PM (19 years ago)

Author:

ryan

Message:

Use get_option instead of get_settings. Just 'cause.

File:

• trunk/wp-login.php (modified) (8 diffs)

trunk/wp-login.php

@@ -17 +17 @@
 
     $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-    if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') )
+    if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') )
         update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
 }
@@ -46 +46 @@
     <title>WordPress &raquo; <?php _e('Lost Password') ?></title>
     <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
-    <link rel="stylesheet" href="<?php echo get_settings('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
+    <link rel="stylesheet" href="<?php echo get_option('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
     <script type="text/javascript">
     function focusit() {
@@ -81 +81 @@
 <ul>
     <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
-<?php if (get_settings('users_can_register')) : ?>
+<?php if (get_option('users_can_register')) : ?>
     <li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
 <?php endif; ?>
@@ -112 +112 @@
     $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
     $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
-    $message .= get_settings('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
-
-    $m = wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_settings('blogname')), $message);
+    $message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
+
+    $m = wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message);
 
     if ($m == false) {
@@ -146 +146 @@
     $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
     $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
-    $message .= get_settings('siteurl') . "/wp-login.php\r\n";
-
-    $m = wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_settings('blogname')), $message);
+    $message .= get_option('siteurl') . "/wp-login.php\r\n";
+
+    $m = wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message);
 
     if ($m == false) {
@@ -159 +159 @@
         // send a copy of password change notification to the admin
         $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
-        wp_mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_settings('blogname')), $message);
+        wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
         die();
     }
@@ -196 +196 @@
         // If the user can't edit posts, send them to their profile.
         if ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' ) )
-            $redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
+            $redirect_to = get_option('siteurl') . '/wp-admin/profile.php';
 
         if ( wp_login($user_login, $user_pass, $using_cookie) ) {
@@ -247 +247 @@
 <ul>
     <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
-<?php if (get_settings('users_can_register')) : ?>
+<?php if (get_option('users_can_register')) : ?>
     <li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
 <?php endif; ?>