From 32b9e8488957c109db3fee86a0f941d3685cb52b Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 23 Jun 2012 10:35:29 -0400
Subject: Fixes #4610 better handling of content requiring a logged in user

---
 mod/thewire/pages/thewire/view.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mod/thewire')

diff --git a/mod/thewire/pages/thewire/view.php b/mod/thewire/pages/thewire/view.php
index 1818e725a..1709e5e9a 100644
--- a/mod/thewire/pages/thewire/view.php
+++ b/mod/thewire/pages/thewire/view.php
@@ -6,6 +6,7 @@
 $post = get_entity(get_input('guid'));
 if (!$post) {
 	register_error(elgg_echo('noaccess'));
+	$_SESSION['last_forward_from'] = current_page_url();
 	forward('');
 }
 $owner = $post->getOwnerEntity();
-- 
cgit v1.2.3


From 1909a0de9540fbb20971639147726bde9690caa4 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 23 Jun 2012 10:38:07 -0400
Subject: added missing break in the wire's page handler

---
 mod/thewire/start.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mod/thewire')

diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 8e3b5224a..65f135889 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -110,6 +110,7 @@ function thewire_page_handler($page) {
 				set_input('guid', $page[1]);
 			}
 			include "$base_dir/view.php";
+			break;
 
 		case "thread":
 			if (isset($page[1])) {
-- 
cgit v1.2.3


From bb46cc43c3c2f410891f1077e57c39ecf58baba8 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 24 Jun 2012 15:18:14 -0400
Subject: updated thewire to extend the correct css view

---
 mod/thewire/start.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/thewire')

diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 65f135889..1ba48263a 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -37,7 +37,7 @@ function thewire_init() {
 	elgg_register_plugin_hook_handler('register', 'menu:entity', 'thewire_setup_entity_menu_items');
 	
 	// Extend system CSS with our own styles, which are defined in the thewire/css view
-	elgg_extend_view('css', 'thewire/css');
+	elgg_extend_view('css/elgg', 'thewire/css');
 
 	//extend views
 	elgg_extend_view('activity/thewire', 'thewire/activity_view');
-- 
cgit v1.2.3


From 8832c48cfb8c54ea5fa13ffd80cfe0395b32967e Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Tue, 10 Jul 2012 20:35:12 -0400
Subject: Fixes #4690 fixes deprecation warning

---
 mod/thewire/actions/delete.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/thewire')

diff --git a/mod/thewire/actions/delete.php b/mod/thewire/actions/delete.php
index 58502a7e7..38355d25e 100644
--- a/mod/thewire/actions/delete.php
+++ b/mod/thewire/actions/delete.php
@@ -24,7 +24,7 @@ if ($thewire->getSubtype() == "thewire" && $thewire->canEdit()) {
 	}
 
 	// Get owning user
-	$owner = get_entity($thewire->getOwner());
+	$owner = get_entity($thewire->getOwnerGUID());
 
 	// Delete it
 	$rowsaffected = $thewire->delete();
-- 
cgit v1.2.3