Changeset 19870

Timestamp:

02/08/2012 04:09:41 PM (13 years ago)

Author:

nacin

Message:

Introduce 'relative' scheme to return only the paths for home_url, site, admin, network_, and get_ variants. props SergeyBiryukov, see #18952.

File:

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

trunk/wp-includes/link-template.php

@@ -1835 +1835 @@
  *
  * @param  string $path   (optional) Path relative to the home url.
- * @param  string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'.
+ * @param  string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https', or 'relative'.
  * @return string Home url link with optional path appended.
 */
@@ -1854 +1854 @@
  * @param  int $blog_id   (optional) Blog ID. Defaults to current blog.
  * @param  string $path   (optional) Path relative to the home url.
- * @param  string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'.
+ * @param  string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https', or 'relative'.
  * @return string Home url link with optional path appended.
 */
@@ -1860 +1860 @@
     $orig_scheme = $scheme;
 
-    if ( !in_array( $scheme, array( 'http', 'https' ) ) )
+    if ( !in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
         $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
 
@@ -1868 +1868 @@
         $url = get_blog_option( $blog_id, 'home' );
 
-    if ( 'http' != $scheme )
+    if ( 'relative' == $scheme )
+        $url = preg_replace( '#^.+://[^/]*#', '', $url ); 
+    elseif ( 'http' != $scheme )
         $url = str_replace( 'http://', "$scheme://", $url );
 
@@ -1890 +1892 @@
  *
  * @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'.
+ * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
  * @return string Site url link with optional path appended.
 */
@@ -1909 +1911 @@
  * @param int $blog_id (optional) Blog ID. Defaults to current blog.
  * @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'.
+ * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
  * @return string Site url link with optional path appended.
 */
@@ -1915 +1917 @@
     // should the list of allowed schemes be maintained elsewhere?
     $orig_scheme = $scheme;
-    if ( !in_array( $scheme, array( 'http', 'https' ) ) ) {
+    if ( !in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
         if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) )
             $scheme = 'https';
@@ -1931 +1933 @@
         $url = get_blog_option( $blog_id, 'siteurl' );
 
-    if ( 'http' != $scheme )
+    if ( 'relative' == $scheme )
+        $url = preg_replace( '#^.+://[^/]*#', '', $url ); 
+    elseif ( 'http' != $scheme )
         $url = str_replace( 'http://', "{$scheme}://", $url );
 
@@ -2062 +2066 @@
  *
  * @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'.
+ * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
  * @return string Site url link with optional path appended.
 */
@@ -2072 +2076 @@
 
     $orig_scheme = $scheme;
-    if ( !in_array($scheme, array('http', 'https')) ) {
+    if ( !in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
         if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) )
             $scheme = 'https';
@@ -2083 +2087 @@
     }
 
-    $url = $scheme . '://' . $current_site->domain . $current_site->path;
+    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 )
@@ -2102 +2109 @@
  *
  * @param  string $path   (optional) Path relative to the home url.
- * @param  string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'.
+ * @param  string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https', or 'relative'.
  * @return string Home url link with optional path appended.
 */
@@ -2113 +2120 @@
     $orig_scheme = $scheme;
 
-    if ( !in_array($scheme, array('http', 'https')) )
+    if ( !in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
         $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
 
-    $url = $scheme . '://' . $current_site->domain . $current_site->path;
+    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 )