11 files changed, 4 insertions, 2 deletions
diff --git a/mod/pages/edit.php b/mod/pages/pages/pages/edit.php
index 8e530084b..8e530084b 100644
--- a/mod/pages/edit.php
+++ b/mod/pages/pages/pages/edit.php
diff --git a/mod/pages/friends.php b/mod/pages/pages/pages/friends.php
index 13aa28578..13aa28578 100644
--- a/mod/pages/friends.php
+++ b/mod/pages/pages/pages/friends.php
diff --git a/mod/pages/history.php b/mod/pages/pages/pages/history.php
index 7ed5ad7f7..7ed5ad7f7 100644
--- a/mod/pages/history.php
+++ b/mod/pages/pages/pages/history.php
diff --git a/mod/pages/index.php b/mod/pages/pages/pages/index.php
index 6a89e6092..6a89e6092 100644
--- a/mod/pages/index.php
+++ b/mod/pages/pages/pages/index.php
diff --git a/mod/pages/new.php b/mod/pages/pages/pages/new.php
index 42a8e04e1..42a8e04e1 100644
--- a/mod/pages/new.php
+++ b/mod/pages/pages/pages/new.php
diff --git a/mod/pages/revision.php b/mod/pages/pages/pages/revision.php
index 968c64b58..968c64b58 100644
--- a/mod/pages/revision.php
+++ b/mod/pages/pages/pages/revision.php
diff --git a/mod/pages/view.php b/mod/pages/pages/pages/view.php
index d3503709d..d3503709d 100644
--- a/mod/pages/view.php
+++ b/mod/pages/pages/pages/view.php
diff --git a/mod/pages/world.php b/mod/pages/pages/pages/world.php
index 668100ad2..668100ad2 100644
--- a/mod/pages/world.php
+++ b/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
index 4da6f95ef..4da6f95ef 100644
--- a/mod/search/index.php
+++ b/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");
 }
 
 /**