From 5a16071104623a6c9f6bc1821e1915b24b2aae96 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 24 Nov 2010 23:32:51 +0000
Subject: Fixes #2667: pagehandler.php => page_handler.php.  You'll need to
 update .htaccess to keep developing

git-svn-id: http://code.elgg.org/elgg/trunk@7440 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/handlers/page_handler.php | 26 ++++++++++++++++++++++++++
 engine/handlers/pagehandler.php  | 26 --------------------------
 htaccess_dist                    |  6 +++---
 3 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 engine/handlers/page_handler.php
 delete mode 100644 engine/handlers/pagehandler.php

diff --git a/engine/handlers/page_handler.php b/engine/handlers/page_handler.php
new file mode 100644
index 000000000..7d293c3e4
--- /dev/null
+++ b/engine/handlers/page_handler.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Pages handler.
+ *
+ * This file dispatches pages.  It is called via a URL rewrite in .htaccess
+ * from http://site/pg/handler/page1/page2.  The first element after 'pg/' is
+ * the page handler name as registered by {@link register_page_handler()}.
+ * The rest of the string is sent to {@link page_handler()}.
+ *
+ * {@link page_handler()} explodes the pages string by / and sends it to
+ * the page handler function as registered by {@link register_page_handler()}.
+ * If a valid page handler isn't found, plugins have a chance to provide a 404.
+ *
+ * @package Elgg.Core
+ * @subpackage PageHandler
+ * @link http://docs.elgg.org/Tutorials/PageHandlers
+ */
+
+require_once(dirname(dirname(__FILE__)) . "/start.php");
+
+$handler = get_input('handler');
+$page = get_input('page');
+
+if (!page_handler($handler, $page)) {
+	forward('', '404');
+}
\ No newline at end of file
diff --git a/engine/handlers/pagehandler.php b/engine/handlers/pagehandler.php
deleted file mode 100644
index 7d293c3e4..000000000
--- a/engine/handlers/pagehandler.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Pages handler.
- *
- * This file dispatches pages.  It is called via a URL rewrite in .htaccess
- * from http://site/pg/handler/page1/page2.  The first element after 'pg/' is
- * the page handler name as registered by {@link register_page_handler()}.
- * The rest of the string is sent to {@link page_handler()}.
- *
- * {@link page_handler()} explodes the pages string by / and sends it to
- * the page handler function as registered by {@link register_page_handler()}.
- * If a valid page handler isn't found, plugins have a chance to provide a 404.
- *
- * @package Elgg.Core
- * @subpackage PageHandler
- * @link http://docs.elgg.org/Tutorials/PageHandlers
- */
-
-require_once(dirname(dirname(__FILE__)) . "/start.php");
-
-$handler = get_input('handler');
-$page = get_input('page');
-
-if (!page_handler($handler, $page)) {
-	forward('', '404');
-}
\ No newline at end of file
diff --git a/htaccess_dist b/htaccess_dist
index fa0714cf1..679dd71d8 100644
--- a/htaccess_dist
+++ b/htaccess_dist
@@ -107,13 +107,13 @@ RewriteRule ^export\/([A-Za-z]+)\/([0-9]+)\/([A-Za-z]+)\/([A-Za-z0-9\_]+)\/$ ser
 
 RewriteRule ^\_css\/css\.css$ _css/css.php
 
-RewriteRule ^pg\/([A-Za-z0-9\_\-]+)\/(.*)$ engine/handlers/pagehandler.php?handler=$1&page=$2&%{QUERY_STRING}
-RewriteRule ^pg\/([A-Za-z0-9\_\-]+)$ engine/handlers/pagehandler.php?handler=$1&%{QUERY_STRING}
+RewriteRule ^pg\/([A-Za-z0-9\_\-]+)\/(.*)$ engine/handlers/page_handler.php?handler=$1&page=$2&%{QUERY_STRING}
+RewriteRule ^pg\/([A-Za-z0-9\_\-]+)$ engine/handlers/page_handler.php?handler=$1&%{QUERY_STRING}
 
 RewriteRule xml-rpc.php engine/handlers/xml-rpc_handler.php
 RewriteRule mt/mt-xmlrpc.cgi engine/handlers/xml-rpc_handler.php
 
-RewriteRule ^tag/(.+)/?$ engine/handlers/pagehandler.php?handler=search&page=$1
+RewriteRule ^tag/(.+)/?$ engine/handlers/page_handler.php?handler=search&page=$1
 
 # rule for rewrite module test during install - can be removed after installation
 RewriteRule ^rewrite.php$ install.php
-- 
cgit v1.2.3