From c46cadcc8264e5ded6e335a337e0312fee42da3c Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 15 Jul 2008 12:39:48 +0000
Subject: Fixes #144

git-svn-id: https://code.elgg.org/elgg/trunk@1426 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/groups/actions/addtogroup.php  | 8 ++++----
 mod/groups/actions/edit.php        | 2 +-
 mod/groups/actions/joinrequest.php | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'mod/groups/actions')

diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php
index 10aea2880..1910a8196 100644
--- a/mod/groups/actions/addtogroup.php
+++ b/mod/groups/actions/addtogroup.php
@@ -47,8 +47,8 @@
 							
 							// send welcome email
 							notify_user($user->getGUID(), $group->owner_guid, 
-								sprintf(elgg_echo('groups:welcome:subject'), $group->title), 
-								sprintf(elgg_echo('groups:welcome:body'), $user->name, $group->title, $group->getURL()),
+								sprintf(elgg_echo('groups:welcome:subject'), $group->name), 
+								sprintf(elgg_echo('groups:welcome:body'), $user->name, $group->name, $group->getURL()),
 								NULL, "email");
 								
 							system_message(elgg_echo('groups:addedtogroup'));
@@ -80,8 +80,8 @@
 				{
 					// Send email
 					if (notify_user($user->getGUID(), $group->owner_guid, 
-							sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->title), 
-							sprintf(elgg_echo('groups:invite:body'), $user->name, $group->title, "{$CONFIG->url}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"),
+							sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->name), 
+							sprintf(elgg_echo('groups:invite:body'), $user->name, $group->name, "{$CONFIG->url}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"),
 							NULL, "email"))
 						system_message(elgg_echo("groups:userinvited"));
 					else
diff --git a/mod/groups/actions/edit.php b/mod/groups/actions/edit.php
index 75ae1f80f..d7c1833a5 100644
--- a/mod/groups/actions/edit.php
+++ b/mod/groups/actions/edit.php
@@ -46,7 +46,7 @@
 	}
 	
 	// Validate create
-	if (!$group->title)
+	if (!$group->name)
 	{
 		register_error(elgg_echo("groups:notitle"));
 		
diff --git a/mod/groups/actions/joinrequest.php b/mod/groups/actions/joinrequest.php
index 3539221fe..bbe896342 100644
--- a/mod/groups/actions/joinrequest.php
+++ b/mod/groups/actions/joinrequest.php
@@ -70,8 +70,8 @@
 		
 			// Send email
 			if (notify_user($group->owner_guid, $user->getGUID(), 
-					sprintf(elgg_echo('groups:request:subject'), $user->name, $group->title), 
-					sprintf(elgg_echo('groups:request:body'), $group->getOwner()->name, $user->name, $group->title, $user->getURL(), "{$CONFIG->url}action/groups/addtogroup?user_guid={$user->guid}&group_guid={$group->guid}"),
+					sprintf(elgg_echo('groups:request:subject'), $user->name, $group->name), 
+					sprintf(elgg_echo('groups:request:body'), $group->getOwner()->name, $user->name, $group->name, $user->getURL(), "{$CONFIG->url}action/groups/addtogroup?user_guid={$user->guid}&group_guid={$group->guid}"),
 					NULL, "email"))
 				system_message(elgg_echo("groups:joinrequestmade"));
 			else
-- 
cgit v1.2.3