Changeset 21734

Timestamp:

09/04/2012 02:44:17 PM (14 years ago)

Author:

ryan

Message:

Use set_url_scheme() in the *_url() functions to keep things DRY. Props johnbillion. fixes #20759

File:

• trunk/wp-includes/link-template.php (modified) (11 diffs)

trunk/wp-includes/link-template.php

@@ -1877 +1877 @@
 */
 function home_url( $path = '', $scheme = null ) {
-        return get_home_url(null, $path, $scheme);
+        return get_home_url( null, $path, $scheme );
 }
 
@@ -1898 +1898 @@
         $orig_scheme = $scheme;
 
-        if ( !in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
+        if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
                 $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
 
@@ -1909 +1909 @@
         }
 
-        if ( 'relative' == $scheme )
-                $url = preg_replace( '#^.+://[^/]*#', '', $url );
-        elseif ( 'http' != $scheme )
-                $url = str_replace( 'http://', "$scheme://", $url );
-
-        if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+        $url = set_url_scheme( $url, $scheme );
+
+        if ( ! empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
                 $url .= '/' . ltrim( $path, '/' );
 
@@ -1933 +1930 @@
  *
  * @param string $path Optional. Path relative to the site url.
- * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
+ * @param string $scheme Optional. Scheme to give the site url context. See set_url_scheme().
  * @return string Site url link with optional path appended.
 */
 function site_url( $path = '', $scheme = null ) {
-        return get_site_url(null, $path, $scheme);
+        return get_site_url( null, $path, $scheme );
 }
 
@@ -1956 +1953 @@
 */
 function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
-        // should the list of allowed schemes be maintained elsewhere?
-        $orig_scheme = $scheme;
-        if ( !in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-                if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) )
-                        $scheme = 'https';
-                elseif ( ( 'login' == $scheme ) && force_ssl_admin() )
-                        $scheme = 'https';
-                elseif ( ( 'admin' == $scheme ) && force_ssl_admin() )
-                        $scheme = 'https';
-                else
-                        $scheme = ( is_ssl() ? 'https' : 'http' );
-        }
-
         if ( empty( $blog_id ) || !is_multisite() ) {
                 $url = get_option( 'siteurl' );
@@ -1977 +1961 @@
         }
 
-        if ( 'relative' == $scheme )
-                $url = preg_replace( '#^.+://[^/]*#', '', $url );
-        elseif ( 'http' != $scheme )
-                $url = str_replace( 'http://', "{$scheme}://", $url );
-
-        if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+        $url = set_url_scheme( $url, $scheme );
+
+        if ( ! empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
                 $url .= '/' . ltrim( $path, '/' );
 
-        return apply_filters( 'site_url', $url, $path, $orig_scheme, $blog_id );
+        return apply_filters( 'site_url', $url, $path, $scheme, $blog_id );
 }
 
@@ -1999 +1980 @@
 */
 function admin_url( $path = '', $scheme = 'admin' ) {
-        return get_admin_url(null, $path, $scheme);
+        return get_admin_url( null, $path, $scheme );
 }
 
@@ -2016 +1997 @@
         $url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
-        if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
-                $url .= ltrim($path, '/');
-
-        return apply_filters('admin_url', $url, $path, $blog_id);
+        if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+                $url .= ltrim( $path, '/' );
+
+        return apply_filters( 'admin_url', $url, $path, $blog_id );
 }
 
@@ -2108 +2089 @@
  *
  * @param string $path Optional. Path relative to the site url.
- * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
+ * @param string $scheme Optional. Scheme to give the site url context. See set_url_scheme().
  * @return string Site url link with optional path appended.
 */
@@ -2114 +2095 @@
         global $current_site;
 
-        if ( !is_multisite() )
+        if ( ! is_multisite() )
                 return site_url($path, $scheme);
-
-        $orig_scheme = $scheme;
-        if ( !in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-                if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) )
-                        $scheme = 'https';
-                elseif ( ('login' == $scheme) && ( force_ssl_admin() ) )
-                        $scheme = 'https';
-                elseif ( ('admin' == $scheme) && force_ssl_admin() )
-                        $scheme = 'https';
-                else
-                        $scheme = ( is_ssl() ? 'https' : 'http' );
-        }
 
         if ( 'relative' == $scheme )
                 $url = $current_site->path;
         else
-                $url = $scheme . '://' . $current_site->domain . $current_site->path;
-
-        if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
-                $url .= ltrim($path, '/');
-
-        return apply_filters('network_site_url', $url, $path, $orig_scheme);
+                $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+
+        if ( ! empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+                $url .= ltrim( $path, '/' );
+
+        return apply_filters( 'network_site_url', $url, $path, $scheme );
 }
 
@@ -2157 +2126 @@
         global $current_site;
 
-        if ( !is_multisite() )
+        if ( ! is_multisite() )
                 return home_url($path, $scheme);
 
         $orig_scheme = $scheme;
 
-        if ( !in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
-                $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
+        if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
+                $scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
 
         if ( 'relative' == $scheme )
                 $url = $current_site->path;
         else
-                $url = $scheme . '://' . $current_site->domain . $current_site->path;
-
-        if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+                $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+
+        if ( ! empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
                 $url .= ltrim( $path, '/' );