Changeset 14702 for trunk/wp-includes/link-template.php

Timestamp:

05/16/2010 09:58:31 PM (15 years ago)

Author:

wpmuguru

Message:

improvements to get_home/site_url, props andreasnrb + code cleanup, see #12735

File:

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

trunk/wp-includes/link-template.php

@@ -1847 +1847 @@
     $orig_scheme = $scheme;
 
-    if ( !in_array($scheme, array('http', 'https')) )
+    if ( !in_array( $scheme, array( 'http', 'https' ) ) )
         $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
 
-    if ( empty($blog_id) || !is_multisite() )
-        $home = get_option('home');
+    if ( empty( $blog_id ) || !is_multisite() )
+        $home = get_option( 'home' );
     else
-        $home = untrailingslashit(get_blogaddress_by_id($blog_id));
+        $home = get_blog_option( $blog_id, 'home' );
 
     $url = str_replace( 'http://', "$scheme://", $home );
@@ -1900 +1900 @@
 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' ) ) ) {
+        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' );
+    else
+        $url = get_blog_option( $blog_id, 'siteurl' );
+
+    $url = str_replace( 'http://', "{$scheme}://", $url );
+
+    if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+        $url .= '/' . ltrim( $path, '/' );
+
+    return apply_filters( 'site_url', $url, $path, $orig_scheme, $blog_id );
+}
+
+/**
+ * Retrieve the url to the admin area for the current site.
+ *
+ * @package WordPress
+ * @since 2.6.0
+ *
+ * @param string $path Optional path relative to the admin url
+ * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
+ * @return string Admin url link with optional path appended
+*/
+function admin_url( $path = '', $scheme = 'admin' ) {
+    return get_admin_url(null, $path, $scheme);
+}
+
+/**
+ * Retrieve the url to the admin area for a given site.
+ *
+ * @package WordPress
+ * @since 3.0.0
+ *
+ * @param int $blog_id (optional) Blog ID. Defaults to current blog.
+ * @param string $path Optional path relative to the admin url
+ * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
+ * @return string Admin url link with optional path appended
+*/
+function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
+    $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);
+}
+
+/**
+ * Retrieve the url to the includes directory.
+ *
+ * @package WordPress
+ * @since 2.6.0
+ *
+ * @param string $path Optional. Path relative to the includes url.
+ * @return string Includes url link with optional path appended.
+*/
+function includes_url($path = '') {
+    $url = site_url() . '/' . WPINC . '/';
+
+    if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
+        $url .= ltrim($path, '/');
+
+    return apply_filters('includes_url', $url, $path);
+}
+
+/**
+ * Retrieve the url to the content directory.
+ *
+ * @package WordPress
+ * @since 2.6.0
+ *
+ * @param string $path Optional. Path relative to the content url.
+ * @return string Content url link with optional path appended.
+*/
+function content_url($path = '') {
+    $url = WP_CONTENT_URL;
+    if ( 0 === strpos($url, 'http') && is_ssl() )
+        $url = str_replace( 'http://', 'https://', $url );
+
+    if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
+        $url .= '/' . ltrim($path, '/');
+
+    return apply_filters('content_url', $url, $path);
+}
+
+/**
+ * Retrieve the url to the plugins directory or to a specific file within that directory.
+ * You can hardcode the plugin slug in $path or pass __FILE__ as a second argument to get the correct folder name.
+ *
+ * @package WordPress
+ * @since 2.6.0
+ *
+ * @param string $path Optional. Path relative to the plugins url.
+ * @param string $plugin Optional. The plugin file that you want to be relative to - i.e. pass in __FILE__
+ * @return string Plugins url link with optional path appended.
+*/
+function plugins_url($path = '', $plugin = '') {
+
+    $mu_plugin_dir = WPMU_PLUGIN_DIR;
+    foreach ( array('path', 'plugin', 'mu_plugin_dir') as $var ) {
+        $$var = str_replace('\\' ,'/', $$var); // sanitize for Win32 installs
+        $$var = preg_replace('|/+|', '/', $$var);
+    }
+
+    if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
+        $url = WPMU_PLUGIN_URL;
+    else
+        $url = WP_PLUGIN_URL;
+
+    if ( 0 === strpos($url, 'http') && is_ssl() )
+        $url = str_replace( 'http://', 'https://', $url );
+
+    if ( !empty($plugin) && is_string($plugin) ) {
+        $folder = dirname(plugin_basename($plugin));
+        if ( '.' != $folder )
+            $url .= '/' . ltrim($folder, '/');
+    }
+
+    if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
+        $url .= '/' . ltrim($path, '/');
+
+    return apply_filters('plugins_url', $url, $path, $plugin);
+}
+
+/**
+ * Retrieve the site url for the current network.
+ *
+ * Returns the site url with the appropriate protocol,  'https' if
+ * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
+ * overridden.
+ *
+ * @package WordPress
+ * @since 3.0.0
+ *
+ * @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', or 'admin'.
+ * @return string Site url link with optional path appended.
+*/
+function network_site_url( $path = '', $scheme = null ) {
+    global $current_site;
+
+    if ( !is_multisite() )
+        return site_url($path, $scheme);
+
     $orig_scheme = $scheme;
     if ( !in_array($scheme, array('http', 'https')) ) {
@@ -1912 +2068 @@
     }
 
-    if ( empty($blog_id) || !is_multisite() )
-        $url = get_option('siteurl');
-    else
-        $url = untrailingslashit(get_blogaddress_by_id($blog_id));
-
-    $url = str_replace( 'http://', "{$scheme}://", $url );
-
-    if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
-        $url .= '/' . ltrim($path, '/');
-
-    return apply_filters('site_url', $url, $path, $orig_scheme, $blog_id);
-}
-
-/**
- * Retrieve the url to the admin area for the current site.
- *
- * @package WordPress
- * @since 2.6.0
- *
- * @param string $path Optional path relative to the admin url
- * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
- * @return string Admin url link with optional path appended
-*/
-function admin_url( $path = '', $scheme = 'admin' ) {
-    return get_admin_url(null, $path, $scheme);
-}
-
-/**
- * Retrieve the url to the admin area for a given site.
- *
- * @package WordPress
- * @since 3.0.0
- *
- * @param int $blog_id (optional) Blog ID. Defaults to current blog.
- * @param string $path Optional path relative to the admin url
- * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
- * @return string Admin url link with optional path appended
-*/
-function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
-    $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);
-}
-
-/**
- * Retrieve the url to the includes directory.
- *
- * @package WordPress
- * @since 2.6.0
- *
- * @param string $path Optional. Path relative to the includes url.
- * @return string Includes url link with optional path appended.
-*/
-function includes_url($path = '') {
-    $url = site_url() . '/' . WPINC . '/';
-
-    if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
-        $url .= ltrim($path, '/');
-
-    return apply_filters('includes_url', $url, $path);
-}
-
-/**
- * Retrieve the url to the content directory.
- *
- * @package WordPress
- * @since 2.6.0
- *
- * @param string $path Optional. Path relative to the content url.
- * @return string Content url link with optional path appended.
-*/
-function content_url($path = '') {
-    $url = WP_CONTENT_URL;
-    if ( 0 === strpos($url, 'http') && is_ssl() )
-        $url = str_replace( 'http://', 'https://', $url );
-
-    if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
-        $url .= '/' . ltrim($path, '/');
-
-    return apply_filters('content_url', $url, $path);
-}
-
-/**
- * Retrieve the url to the plugins directory or to a specific file within that directory.
- * You can hardcode the plugin slug in $path or pass __FILE__ as a second argument to get the correct folder name.
- *
- * @package WordPress
- * @since 2.6.0
- *
- * @param string $path Optional. Path relative to the plugins url.
- * @param string $plugin Optional. The plugin file that you want to be relative to - i.e. pass in __FILE__
- * @return string Plugins url link with optional path appended.
-*/
-function plugins_url($path = '', $plugin = '') {
-
-    $mu_plugin_dir = WPMU_PLUGIN_DIR;
-    foreach ( array('path', 'plugin', 'mu_plugin_dir') as $var ) {
-        $$var = str_replace('\\' ,'/', $$var); // sanitize for Win32 installs
-        $$var = preg_replace('|/+|', '/', $$var);
-    }
-
-    if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
-        $url = WPMU_PLUGIN_URL;
-    else
-        $url = WP_PLUGIN_URL;
-
-    if ( 0 === strpos($url, 'http') && is_ssl() )
-        $url = str_replace( 'http://', 'https://', $url );
-
-    if ( !empty($plugin) && is_string($plugin) ) {
-        $folder = dirname(plugin_basename($plugin));
-        if ( '.' != $folder )
-            $url .= '/' . ltrim($folder, '/');
-    }
-
-    if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
-        $url .= '/' . ltrim($path, '/');
-
-    return apply_filters('plugins_url', $url, $path, $plugin);
-}
-
-/**
- * Retrieve the site url for the current network.
- *
- * Returns the site url with the appropriate protocol,  'https' if
- * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
- * overridden.
- *
- * @package WordPress
- * @since 3.0.0
- *
- * @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', or 'admin'.
- * @return string Site url link with optional path appended.
-*/
-function network_site_url( $path = '', $scheme = null ) {
-    global $current_site;
-
-    if ( !is_multisite() )
-        return site_url($path, $scheme);
-
-    $orig_scheme = $scheme;
-    if ( !in_array($scheme, array('http', 'https')) ) {
-        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' );
-    }
-
     $url = 'http://' . $current_site->domain . $current_site->path;