Changeset 8058 for trunk/wp-includes/general-template.php

Timestamp:

06/06/2008 07:39:11 AM (18 years ago)

Author:

ryan

Message:

More use of site_url(), admin_url(), and site_url(). Force login and admin links to be https if FORCE_SSL_LOGIN. see #7001

File:

• trunk/wp-includes/general-template.php (modified) (2 diffs)

trunk/wp-includes/general-template.php

@@ -34 +34 @@
 function wp_loginout() {
         if ( ! is_user_logged_in() )
-                $link = '<a href="' . get_option('siteurl') . '/wp-login.php">' . __('Log in') . '</a>';
+                $link = '<a href="' . site_url('wp-login.php', 'forceable') . '">' . __('Log in') . '</a>';
         else
-                $link = '<a href="' . get_option('siteurl') . '/wp-login.php?action=logout">' . __('Log out') . '</a>';
+                $link = '<a href="' . site_url('wp-login.php?action=logout', 'forceable') . '">' . __('Log out') . '</a>';
 
         echo apply_filters('loginout', $link);
@@ -46 +46 @@
         if ( ! is_user_logged_in() ) {
                 if ( get_option('users_can_register') )
-                        $link = $before . '<a href="' . get_option('siteurl') . '/wp-login.php?action=register">' . __('Register') . '</a>' . $after;
+                        $link = $before . '<a href="' . site_url('wp-login.php?action=register', 'forceable') . '">' . __('Register') . '</a>' . $after;
                 else
                         $link = '';
         } else {
-                $link = $before . '<a href="' . get_option('siteurl') . '/wp-admin/">' . __('Site Admin') . '</a>' . $after;
+                $link = $before . '<a href="' . admin_url() . '">' . __('Site Admin') . '</a>' . $after;
         }