From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 19 Mar 2011 15:19:02 +0000 (+0000)
Subject: Fixes #3158 updated search and pages plugins for page handler scripts
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b5e2dbf292cddd56a8171b4c9cf1d9cf0fb45582;p=lorea%2Felgg.git

Fixes #3158 updated search and pages plugins for page handler scripts


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

diff --git a/mod/pages/edit.php b/mod/pages/pages/pages/edit.php
similarity index 100%
rename from mod/pages/edit.php
rename to mod/pages/pages/pages/edit.php
diff --git a/mod/pages/friends.php b/mod/pages/pages/pages/friends.php
similarity index 100%
rename from mod/pages/friends.php
rename to mod/pages/pages/pages/friends.php
diff --git a/mod/pages/history.php b/mod/pages/pages/pages/history.php
similarity index 100%
rename from mod/pages/history.php
rename to mod/pages/pages/pages/history.php
diff --git a/mod/pages/index.php b/mod/pages/pages/pages/index.php
similarity index 100%
rename from mod/pages/index.php
rename to mod/pages/pages/pages/index.php
diff --git a/mod/pages/new.php b/mod/pages/pages/pages/new.php
similarity index 100%
rename from mod/pages/new.php
rename to mod/pages/pages/pages/new.php
diff --git a/mod/pages/revision.php b/mod/pages/pages/pages/revision.php
similarity index 100%
rename from mod/pages/revision.php
rename to mod/pages/pages/pages/revision.php
diff --git a/mod/pages/view.php b/mod/pages/pages/pages/view.php
similarity index 100%
rename from mod/pages/view.php
rename to mod/pages/pages/pages/view.php
diff --git a/mod/pages/world.php b/mod/pages/pages/pages/world.php
similarity index 100%
rename from mod/pages/world.php
rename to mod/pages/pages/pages/world.php
diff --git a/mod/pages/start.php b/mod/pages/start.php
index 3404a8cd2..7a4df23c4 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -115,7 +115,7 @@ function pages_page_handler($page) {
 
 	elgg_push_breadcrumb(elgg_echo('pages'), 'pages/all');
 
-	$base_dir = elgg_get_plugins_path() . 'pages';
+	$base_dir = elgg_get_plugins_path() . 'pages/pages/pages';
 
 	$page_type = $page[0];
 	switch ($page_type) {
diff --git a/mod/search/index.php b/mod/search/pages/search/index.php
similarity index 100%
rename from mod/search/index.php
rename to mod/search/pages/search/index.php
diff --git a/mod/search/start.php b/mod/search/start.php
index ab7aa1c4c..18a0d59e3 100644
--- a/mod/search/start.php
+++ b/mod/search/start.php
@@ -68,7 +68,9 @@ function search_page_handler($page) {
 		//set_input('search_type', 'tags');
 	}
 
-	include_once('index.php');
+	$base_dir = elgg_get_plugins_path() . 'search/pages/search';
+
+	include_once("$base_dir/index.php");
 }
 
 /**