Refs #1089: Added [B] flag to rewrite for tags. Won't work until apache 2.2.12....

git-svn-id: https://code.elgg.org/elgg/trunk@3392 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/pagehandler.php b/engine/lib/pagehandler.php
index cc347ed172527b8fa12bfde9aad1609671ed101c..b993469d8a9aba7dd736a9bdbd85a968742619c3 100644 (file)
--- a/engine/lib/pagehandler.php
+++ b/engine/lib/pagehandler.php
@@ -26,20 +26,15 @@
                \r
                $query = parse_url($_SERVER['REQUEST_URI']);\r
                if (isset($query['query'])) {\r
-                       $query = $query['query'];\r
-                       $query = rawurldecode($query);\r
-                       $query = explode('&',$query);\r
-                       if (sizeof($query) > 0) {\r
-                               foreach($query as $queryelement) {\r
-                                       $vals = explode('=',$queryelement, 2);\r
-                                       if (sizeof($vals) > 1) {\r
-                                               set_input(urldecode($vals[0]),urldecode($vals[1]));\r
-                                       }\r
+                       parse_str($query['query'], $query_arr);\r
+                       if (is_array($query_arr)) {\r
+                               foreach($query_arr as $name => $val) {\r
+                                       set_input($name, $val);\r
                                }\r
                        }\r
                }\r
-\r
                $page = explode('/',$page);\r
+               \r
                if (!isset($CONFIG->pagehandler) || empty($handler)) {\r
                        $result = false;\r
                } else if (isset($CONFIG->pagehandler[$handler]) && is_callable($CONFIG->pagehandler[$handler])) {\r

diff --git a/htaccess_dist b/htaccess_dist
index eb9b3afccf6b903c6f6b4f58776e1b467c44b89f..00c29ab79526f604fa0c0461d637047e51c63116 100644 (file)
--- a/htaccess_dist
+++ b/htaccess_dist
@@ -130,6 +130,6 @@ RewriteRule ^pg\/([A-Za-z0-9\_\-]+)$ engine/handlers/pagehandler.php?handler=$1
 RewriteRule xml-rpc.php engine/handlers/xml-rpc_handler.php\r
 RewriteRule mt/mt-xmlrpc.cgi engine/handlers/xml-rpc_handler.php\r
 \r
-RewriteRule ^tag/(.+)/?$ engine/handlers/pagehandler.php?handler=search&page=$1\r
+RewriteRule ^tag/(.+)/?$ engine/handlers/pagehandler.php?handler=search&page=$1 [B]\r
 \r
-</IfModule>
\ No newline at end of file
+</IfModule>\r