Fixes #3080: Move redirect code to before engine inclusion

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

diff --git a/engine/handlers/page_handler.php b/engine/handlers/page_handler.php
index 491a1b20072dc5fec7a5a036a5d58c8a0c1fe35e..1ed295b7d0cbcdff16b1b3e885d0a784426a07de 100644 (file)
--- a/engine/handlers/page_handler.php
+++ b/engine/handlers/page_handler.php
@@ -28,16 +28,18 @@
  * @link http://docs.elgg.org/Tutorials/PageHandlers
  */
 
-require_once(dirname(dirname(__FILE__)) . "/start.php");
 
-$url = current_page_url();
-$new_url = preg_replace('#/pg/#', '/', $url);
+// Permanent redirect to pg-less urls
+$url = $_SERVER['REQUEST_URI'];
+$new_url = preg_replace('#/pg/#', '/', $url, 1);
 
 if ($url !== $new_url) {
        header("HTTP/1.1 301 Moved Permanently"); 
        header("Location: $new_url"); 
 }
 
+require_once(dirname(dirname(__FILE__)) . "/start.php");
+
 $handler = get_input('handler');
 $page = get_input('page');