# HG changeset patch
# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
# Date 2012-02-09 21:05:16
# Node ID 5608907ef402d8382b2de299eb5f50b5ec2c0cdf
# Parent  4d7bb7e8bc2e569cb71d4f2d2f9eccda170b459d

Fix regression in 4d7bb7e8bc2e which caused redirection to the parent directory of slate_permutate.

diff --git a/inc/class.page.php b/inc/class.page.php
--- a/inc/class.page.php
+++ b/inc/class.page.php
@@ -655,7 +655,8 @@ class page
 	  $base_uri = $proto . '://' . $host;
 	  if ($port !== NULL)
 	    $base_uri .= ':' . $port;
-	  $base_uri .= dirname($_SERVER['REQUEST_URI']) . '/';
+	  list($base_request_uri) = explode('?', $_SERVER['REQUEST_URI'], 2);
+	  $base_uri .= substr($base_request_uri, 0, strrpos($base_request_uri, '/')) . '/';
 	}
 
     if (empty($base_uri) && empty($uri))