Changeset 8058 for trunk/wp-includes/link-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/link-template.php (modified) (3 diffs)

trunk/wp-includes/link-template.php

@@ -751 +751 @@
             var x=d.selection;
             var s=(e?e():(k)?k():(x?x.createRange().text:0));
-            var f='" . get_settings('siteurl') . '/wp-admin/press-this.php' . "';
+            var f='" . admin_url('press-this.php') . "';
             var l=d.location;
             var e=encodeURIComponent;
@@ -780 +780 @@
 function site_url($path = '', $scheme = null) {
     // should the list of allowed schemes be maintained elsewhere?
-    if ( !in_array($scheme, array('http', 'https')) )
-        $scheme = ( is_ssl() ? 'https' : 'http' );
+    if ( !in_array($scheme, array('http', 'https')) ) {
+        if ( ('forceable' == $scheme) && (defined('FORCE_SSL_LOGIN') && FORCE_SSL_LOGIN) )
+            $scheme = 'https';
+        else
+            $scheme = ( is_ssl() ? 'https' : 'http' );
+    }
 
     $url = str_replace( 'http://', "{$scheme}://", get_option('siteurl') );
@@ -794 +798 @@
     global $_wp_admin_url;
 
-    $url = site_url() . '/wp-admin/';
+    $url = site_url('wp-admin/', 'forceable');
 
     if ( !empty($path) && is_string($path) && strpos($path, '..') === false )