From 54773892f88f53231b85d08d86d11557121d9609 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Fri, 4 Nov 2011 22:40:06 -0400
Subject: Fixes #4059 page handlers all return nothing

---
 mod/thewire/start.php | 89 +++++++++++++++++++++++++--------------------------
 1 file changed, 44 insertions(+), 45 deletions(-)

(limited to 'mod/thewire')

diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index d5e995359..f46d9ec75 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -84,58 +84,57 @@ function thewire_init() {
  * thewire/tag/<tag>            View wire posts tagged with <tag>
  *
  * @param array $page From the page_handler function
- * @return true|false Depending on success
+ * @return void
  */
 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 "$base_dir/everyone.php";
-				break;
-
-			case "friends":
-				include "$base_dir/friends.php";
-				break;
-
-			case "owner":
-				include "$base_dir/owner.php";
-				break;
-
-			case "thread":
-				if (isset($page[1])) {
-					set_input('thread_id', $page[1]);
-				}
-				include "$base_dir/thread.php";
-				break;
-			case "reply":
-				if (isset($page[1])) {
-					set_input('guid', $page[1]);
-				}
-				include "$base_dir/reply.php";
-				break;
-			case "tag":
-				if (isset($page[1])) {
-					set_input('tag', $page[1]);
-				}
-				include "$base_dir/tag.php";
-				break;
-			case "previous":
-				if (isset($page[1])) {
-					set_input('guid', $page[1]);
-				}
-				include "$base_dir/previous.php";
-				break;
-		}
-	} else {
-		include "$base_dir/everyone.php";
+	if (!isset($page[0])) {
+		$page = array('all');
 	}
 
-	return true;
+	switch ($page[0]) {
+		case "all":
+			include "$base_dir/everyone.php";
+			break;
+
+		case "friends":
+			include "$base_dir/friends.php";
+			break;
+
+		case "owner":
+			include "$base_dir/owner.php";
+			break;
+
+		case "thread":
+			if (isset($page[1])) {
+				set_input('thread_id', $page[1]);
+			}
+			include "$base_dir/thread.php";
+			break;
+
+		case "reply":
+			if (isset($page[1])) {
+				set_input('guid', $page[1]);
+			}
+			include "$base_dir/reply.php";
+			break;
+
+		case "tag":
+			if (isset($page[1])) {
+				set_input('tag', $page[1]);
+			}
+			include "$base_dir/tag.php";
+			break;
+
+		case "previous":
+			if (isset($page[1])) {
+				set_input('guid', $page[1]);
+			}
+			include "$base_dir/previous.php";
+			break;
+	}
 }
 
 /**
-- 
cgit v1.2.3