aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-19 15:33:06 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-19 15:33:06 +0000
commite4bc53c61702b22c845cbbd22ba3335935ee2c9c (patch)
tree1434596c6c93e1975bcd31b6b48d18a72978be5e
parentb5e2dbf292cddd56a8171b4c9cf1d9cf0fb45582 (diff)
downloadelgg-e4bc53c61702b22c845cbbd22ba3335935ee2c9c.tar.gz
elgg-e4bc53c61702b22c845cbbd22ba3335935ee2c9c.tar.bz2
Fixes #3176 replaced usage of index.php where appropriate
git-svn-id: http://code.elgg.org/elgg/trunk@8770 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/file/pages/file/owner.php (renamed from mod/file/pages/file/index.php)0
-rw-r--r--mod/file/start.php2
-rw-r--r--mod/pages/pages/pages/owner.php (renamed from mod/pages/pages/pages/index.php)0
-rw-r--r--mod/pages/start.php2
-rw-r--r--mod/thewire/pages/thewire/owner.php (renamed from mod/thewire/pages/thewire/user.php)0
-rw-r--r--mod/thewire/start.php18
6 files changed, 12 insertions, 10 deletions
diff --git a/mod/file/pages/file/index.php b/mod/file/pages/file/owner.php
index 617e4c7f4..617e4c7f4 100644
--- a/mod/file/pages/file/index.php
+++ b/mod/file/pages/file/owner.php
diff --git a/mod/file/start.php b/mod/file/start.php
index f49c6fc91..a332b356f 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -91,7 +91,7 @@ function file_page_handler($page) {
$page_type = $page[0];
switch ($page_type) {
case 'owner':
- include "$file_dir/index.php";
+ include "$file_dir/owner.php";
break;
case 'friends':
include "$file_dir/friends.php";
diff --git a/mod/pages/pages/pages/index.php b/mod/pages/pages/pages/owner.php
index 6a89e6092..6a89e6092 100644
--- a/mod/pages/pages/pages/index.php
+++ b/mod/pages/pages/pages/owner.php
diff --git a/mod/pages/start.php b/mod/pages/start.php
index 7a4df23c4..2ce7d1b0f 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -120,7 +120,7 @@ function pages_page_handler($page) {
$page_type = $page[0];
switch ($page_type) {
case 'owner':
- include "$base_dir/index.php";
+ include "$base_dir/owner.php";
break;
case 'friends':
include "$base_dir/friends.php";
diff --git a/mod/thewire/pages/thewire/user.php b/mod/thewire/pages/thewire/owner.php
index 5645b23ba..5645b23ba 100644
--- a/mod/thewire/pages/thewire/user.php
+++ b/mod/thewire/pages/thewire/owner.php
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 26a1adbec..c87831bee 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -80,49 +80,51 @@ function thewire_init() {
*/
function thewire_page_handler($page) {
+ $base_dir = elgg_get_plugins_path() . 'thewire/pages/thewire';
+
// if just /thewire go to global view in the else statement
if (isset($page[0]) && $page[0]) {
switch ($page[0]) {
case "all":
- include dirname(__FILE__) . "/pages/thewire/everyone.php";
+ include "$base_dir/everyone.php";
break;
case "friends":
- include dirname(__FILE__) . "/pages/thewire/friends.php";
+ include "$base_dir/friends.php";
break;
case "owner":
- include dirname(__FILE__) . "/pages/thewire/user.php";
+ include "$base_dir/owner.php";
break;
case "thread":
if (isset($page[1])) {
set_input('thread_id', $page[1]);
}
- include dirname(__FILE__) . "/pages/thewire/thread.php";
+ include "$base_dir/thread.php";
break;
case "reply":
if (isset($page[1])) {
set_input('guid', $page[1]);
}
- include dirname(__FILE__) . "/pages/thewire/reply.php";
+ include "$base_dir/reply.php";
break;
case "tag":
if (isset($page[1])) {
set_input('tag', $page[1]);
}
- include dirname(__FILE__) . "/pages/thewire/tag.php";
+ include "$base_dir/tag.php";
break;
case "previous":
if (isset($page[1])) {
set_input('guid', $page[1]);
}
- include dirname(__FILE__) . "/pages/thewire/previous.php";
+ include "$base_dir/previous.php";
break;
}
} else {
- include dirname(__FILE__) . "/pages/thewire/everyone.php";
+ include "$base_dir/everyone.php";
}
return true;