Changes from trunk/wp-includes/pluggable.php at r11506 to branches/2.8/wp-includes/pluggable.php at r11616

File:

• branches/2.8/wp-includes/pluggable.php (modified) (4 diffs)

branches/2.8/wp-includes/pluggable.php

@@ -881 +881 @@
 
     // remove %0d and %0a from location
-    $strip = array('%0d', '%0a');
-    $found = true;
-    while($found) {
-        $found = false;
-        foreach( (array) $strip as $val ) {
-            while(strpos($location, $val) !== false) {
-                $found = true;
-                $location = str_replace($val, '', $location);
-            }
-        }
-    }
+    $strip = array('%0d', '%0a', '%0D', '%0A');
+    $location = _deep_replace($strip, $location);
     return $location;
 }
@@ -909 +900 @@
  *
  * @since 2.3
- * @uses apply_filters() Calls 'allowed_redirect_hosts' on an array containing
- *      WordPress host string and $location host string.
+ * @uses wp_validate_redirect() To validate the redirect is to an allowed host.
  *
  * @return void Does not return anything
@@ -919 +909 @@
     $location = wp_sanitize_redirect($location);
 
+    $location = wp_validate_redirect($location, admin_url());
+
+    wp_redirect($location, $status);
+}
+endif;
+
+if ( !function_exists('wp_validate_redirect') ) :
+/**
+ * Validates a URL for use in a redirect.
+ *
+ * Checks whether the $location is using an allowed host, if it has an absolute
+ * path. A plugin can therefore set or remove allowed host(s) to or from the
+ * list.
+ *
+ * If the host is not allowed, then the redirect is to $default supplied
+ *
+ * @since 2.8.1
+ * @uses apply_filters() Calls 'allowed_redirect_hosts' on an array containing
+ *      WordPress host string and $location host string.
+ *
+ * @param string $location The redirect to validate
+ * @param string $default The value to return is $location is not allowed
+ * @return string redirect-sanitized URL
+ **/
+function wp_validate_redirect($location, $default = '') {
     // browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
     if ( substr($location, 0, 2) == '//' )
@@ -932 +947 @@
 
     if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) )
-        $location = admin_url();
-
-    wp_redirect($location, $status);
+        $location = $default;
+
+    return $location;
 }
 endif;