When rewriting URLs use /rt/-/* instead of *?rt=rt (#7806)

diff --git a/chora/.htaccess b/chora/.htaccess
index dc66fa7..17ba42e 100644 (file)
--- a/chora/.htaccess
+++ b/chora/.htaccess
@@ -1,9 +1,9 @@
 Allow from all
 <IfModule mod_rewrite.c>
-       RewriteEngine On
-       RewriteRule   ^([a-z]+).php/(.*)$ $1.php?f=$2 [QSA,L]
-       RewriteCond   %{REQUEST_FILENAME}  !-d
-       RewriteCond   %{REQUEST_FILENAME}  !-f
-       RewriteRule   ^browse/(.*)$ browsedir.php?f=$1 [QSA]
-       RewriteRule   ^(.*)$ browsedir.php?f=$1 [QSA]
+    RewriteEngine On
+    RewriteRule   ^([a-z]+).php/(.*)$ $1.php?f=$2 [QSA,L]
+    RewriteCond   %{REQUEST_FILENAME} !-d
+    RewriteCond   %{REQUEST_FILENAME} !-f
+    RewriteRule   ^browse/(.*)$ browsedir.php?f=$1 [QSA]
+    RewriteRule   ^([a-z-]+)/-/browse/(.*)$ browsedir.php?f=$2&rt=$1 [QSA]
 </IfModule>

diff --git a/chora/lib/Chora.php b/chora/lib/Chora.php
index fb0ef02..2801038 100644 (file)
--- a/chora/lib/Chora.php
+++ b/chora/lib/Chora.php
@@ -105,8 +105,7 @@ class Chora
      *
      * @return string  The URL, with session information if necessary.
      */
-    static public function url($script, $uri = '', $args = array(),
-                               $anchor = '')
+    static public function url($script, $uri = '', $args = array(), $anchor = '')
     {
         $arglist = self::_getArgList($GLOBALS['acts'], $GLOBALS['defaultActs'], $args);
         $script .= '.php';
@@ -118,6 +117,10 @@ class Chora
                 } else {
                     $script = "browse/$uri";
                 }
+                if (isset($args['rt'])) {
+                    $script = urlencode($arglist['rt']) . "/-/$script";
+                    unset($arglist['rt']);
+                }
             } else {
                 $script .= '/' . $uri;
             }