Workaround for http_build_query() oddities in low-level router parent code when PHP config is set with non-default separator.

2010-10-21 19:10:43 -07:00 · 2010-10-21 19:10:43 -07:00 · d6f4588b9e
commit d6f4588b9e
parent 131c339c5a
1 changed files with 9 additions and 0 deletions
--- a/lib/router.php
+++ b/lib/router.php
@ -863,7 +863,16 @@ class Router
        if ($qpos !== false) {
            $url = substr($url, 0, $qpos+1) .
              str_replace('?', '&', substr($url, $qpos+1));
+
+            // @fixme this is a hacky workaround for http_build_query in the
+            // lower-level code and bad configs that set the default separator
+            // to &amp; instead of &. Encoded &s in parameters will not be
+            // affected.
+            $url = substr($url, 0, $qpos+1) .
+              str_replace('&amp;', '&', substr($url, $qpos+1));
+
        }
+
        return $url;
    }
 }