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

Timestamp:

02/28/2013 09:04:26 PM (12 years ago)

Author:

nacin

Message:

Allow paths with two consecutive dots to be passed to home_url() and all related *_url() functions.

props markjaquith.
fixes #19032.

File:

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

trunk/wp-includes/link-template.php

@@ -1920 +1920 @@
     $url = set_url_scheme( $url, $scheme );
 
-    if ( ! empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+    if ( $path && is_string( $path ) )
         $url .= '/' . ltrim( $path, '/' );
 
@@ -1972 +1972 @@
     $url = set_url_scheme( $url, $scheme );
 
-    if ( ! empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+    if ( $path && is_string( $path ) )
         $url .= '/' . ltrim( $path, '/' );
 
@@ -2006 +2006 @@
     $url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
-    if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+    if ( $path && is_string( $path ) )
         $url .= ltrim( $path, '/' );
 
@@ -2024 +2024 @@
     $url = site_url() . '/' . WPINC . '/';
 
-    if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
+    if ( $path && is_string( $path ) )
         $url .= ltrim($path, '/');
 
@@ -2042 +2042 @@
     $url = set_url_scheme( WP_CONTENT_URL );
 
-    if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
+    if ( $path && is_string( $path ) )
         $url .= '/' . ltrim($path, '/');
 
@@ -2081 +2081 @@
     }
 
-    if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
+    if ( $path && is_string( $path ) )
         $url .= '/' . ltrim($path, '/');
 
@@ -2112 +2112 @@
         $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
 
-    if ( ! empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+    if ( $path && is_string( $path ) )
         $url .= ltrim( $path, '/' );
 
@@ -2148 +2148 @@
         $url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
 
-    if ( ! empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+    if ( $path && is_string( $path ) )
         $url .= ltrim( $path, '/' );
 
@@ -2170 +2170 @@
     $url = network_site_url('wp-admin/network/', $scheme);
 
-    if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
+    if ( $path && is_string( $path ) )
         $url .= ltrim($path, '/');
 
@@ -2189 +2189 @@
     $url = network_site_url('wp-admin/user/', $scheme);
 
-    if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
+    if ( $path && is_string( $path ) )
         $url .= ltrim($path, '/');