From d2a0969effd0d01b5e26ab916398bc0eb08cb9f6 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 20 Nov 2011 19:48:40 -0500
Subject: added check in case something goes wrong with the container entity of
 a discussion

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

(limited to 'mod/groups')

diff --git a/mod/groups/start.php b/mod/groups/start.php
index 7dcf6b7c4..09362cbbc 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -830,7 +830,7 @@ function discussion_add_to_river_menu($hook, $type, $return, $params) {
 		if (elgg_instanceof($object, 'object', 'groupforumtopic')) {
 			if ($item->annotation_id == 0) {
 				$group = $object->getContainerEntity();
-				if ($group->canWriteToContainer() || elgg_is_admin_logged_in()) {
+				if ($group && ($group->canWriteToContainer() || elgg_is_admin_logged_in())) {
 					$options = array(
 						'name' => 'reply',
 						'href' => "#groups-reply-$object->guid",
-- 
cgit v1.2.3


From efd3dbc1537f1af4a1217e0a9179d4ec444f8f6a Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Fri, 25 Nov 2011 13:44:29 -0500
Subject: Fixes #4151 removed unnecessary $user definition

---
 mod/groups/views/default/groups/membershiprequests.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'mod/groups')

diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php
index 9cd28262f..2bac0e32b 100644
--- a/mod/groups/views/default/groups/membershiprequests.php
+++ b/mod/groups/views/default/groups/membershiprequests.php
@@ -7,7 +7,6 @@
  */
 
 if (!empty($vars['requests']) && is_array($vars['requests'])) {
-	$user = elgg_get_logged_in_user_entity();
 	echo '<ul class="elgg-list">';
 	foreach ($vars['requests'] as $user) {
 		$icon = elgg_view_entity_icon($user, 'tiny', array('use_hover' => 'true'));
@@ -44,5 +43,5 @@ if (!empty($vars['requests']) && is_array($vars['requests'])) {
 	}
 	echo '</ul>';
 } else {
-		echo '<p class="mtm">' . elgg_echo('groups:requests:none') . "</p>";
+	echo '<p class="mtm">' . elgg_echo('groups:requests:none') . '</p>';
 }
-- 
cgit v1.2.3