Refs #2543: Updated trunk mods and views to use the new functions from previous 2 commits.

git-svn-id: http://code.elgg.org/elgg/trunk@8079 36083f99-b078-4883-b0ff-0f9b5a30f544

10 files changed, 12 insertions, 12 deletions

diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php
index 651b90abb..d75c5fdb8 100644
--- a/mod/groups/actions/addtogroup.php
+++ b/mod/groups/actions/addtogroup.php
@@ -4,7 +4,7 @@
  *
  * @package ElggGroups
  */
-$logged_in_user = get_loggedin_user();
+$logged_in_user = elgg_get_logged_in_user_entity();
 
 $user_guid = get_input('user_guid');
 if (!is_array($user_guid))
@@ -20,7 +20,7 @@ if (sizeof($user_guid)) {
 
 		if ($user && $group) {
 
-			//if (get_loggedin_userid() == $group->owner_guid)
+			//if (elgg_get_logged_in_user_guid() == $group->owner_guid)
 			if ($group->canEdit()) {
 
 				// If the group is open or the user has requested membership
diff --git a/mod/groups/actions/delete.php b/mod/groups/actions/delete.php
index 5672e8c47..a99b3a2c6 100644
--- a/mod/groups/actions/delete.php
+++ b/mod/groups/actions/delete.php
@@ -16,5 +16,5 @@ if (($entity) && ($entity instanceof ElggGroup))
 else
 	register_error(elgg_echo('group:notdeleted'));
 
-$url_name = get_loggedin_user()->username;
+$url_name = elgg_get_logged_in_user_entity()->username;
 forward(elgg_get_site_url() . "pg/groups/member/{$url_name}");
diff --git a/mod/groups/actions/discussion/save.php b/mod/groups/actions/discussion/save.php
index 8e8f08a50..f553b562c 100644
--- a/mod/groups/actions/discussion/save.php
+++ b/mod/groups/actions/discussion/save.php
@@ -67,7 +67,7 @@ elgg_clear_sticky_form('topic');
 // handle results differently for new topics and topic edits
 if ($new_topic) {
 	system_message(elgg_echo('discussion:topic:created'));
-	add_to_river('river/forum/topic/create', 'create', get_loggedin_userid(), $topic->guid);
+	add_to_river('river/forum/topic/create', 'create', elgg_get_logged_in_user_guid(), $topic->guid);
 } else {
 	system_message(elgg_echo('discussion:topic:updated'));
 }
diff --git a/mod/groups/actions/edit.php b/mod/groups/actions/edit.php
index c8a68d238..e10739244 100644
--- a/mod/groups/actions/edit.php
+++ b/mod/groups/actions/edit.php
@@ -34,7 +34,7 @@ foreach ($CONFIG->group as $shortname => $valuetype) {
 $input['name'] = get_input('name');
 $input['name'] = html_entity_decode($input['name'], ENT_COMPAT, 'UTF-8');
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 $group_guid = (int)get_input('group_guid');
 $new_group_flag = $group_guid == 0;
diff --git a/mod/groups/actions/groupskillinvitation.php b/mod/groups/actions/groupskillinvitation.php
index 503c41939..516490bc9 100644
--- a/mod/groups/actions/groupskillinvitation.php
+++ b/mod/groups/actions/groupskillinvitation.php
@@ -5,7 +5,7 @@
  * @package ElggGroups
  */
 
-$user_guid = get_input('user_guid', get_loggedin_userid());
+$user_guid = get_input('user_guid', elgg_get_logged_in_user_guid());
 $group_guid = get_input('group_guid');
 
 $user = get_entity($user_guid);
diff --git a/mod/groups/actions/groupskillrequest.php b/mod/groups/actions/groupskillrequest.php
index f7f8a5157..9d45bb25f 100644
--- a/mod/groups/actions/groupskillrequest.php
+++ b/mod/groups/actions/groupskillrequest.php
@@ -5,7 +5,7 @@
  * @package ElggGroups
  */
 
-$user_guid = get_input('user_guid', get_loggedin_userid());
+$user_guid = get_input('user_guid', elgg_get_logged_in_user_guid());
 $group_guid = get_input('group_guid');
 
 $user = get_entity($user_guid);
diff --git a/mod/groups/actions/invite.php b/mod/groups/actions/invite.php
index e8eeb3330..1f8281071 100644
--- a/mod/groups/actions/invite.php
+++ b/mod/groups/actions/invite.php
@@ -5,7 +5,7 @@
  * @package ElggGroups
  */
 
-$logged_in_user = get_loggedin_user();
+$logged_in_user = elgg_get_logged_in_user_entity();
 
 $user_guid = get_input('user_guid');
 if (!is_array($user_guid)) {
diff --git a/mod/groups/actions/join.php b/mod/groups/actions/join.php
index e058cdc22..72294c3ad 100644
--- a/mod/groups/actions/join.php
+++ b/mod/groups/actions/join.php
@@ -5,7 +5,7 @@
  * @package ElggGroups
  */
 
-$user_guid = get_input('user_guid', get_loggedin_userid());
+$user_guid = get_input('user_guid', elgg_get_logged_in_user_guid());
 $group_guid = get_input('group_guid');
 
 // @todo fix for #287
diff --git a/mod/groups/actions/joinrequest.php b/mod/groups/actions/joinrequest.php
index c1d41e8e8..1631712b6 100644
--- a/mod/groups/actions/joinrequest.php
+++ b/mod/groups/actions/joinrequest.php
@@ -5,7 +5,7 @@
  * @package ElggGroups
  */
 
-$user_guid = get_input('user_guid', get_loggedin_userid());
+$user_guid = get_input('user_guid', elgg_get_logged_in_user_guid());
 $group_guid = get_input('group_guid');
 
 
diff --git a/mod/groups/actions/leave.php b/mod/groups/actions/leave.php
index a9163a3d1..390870df1 100644
--- a/mod/groups/actions/leave.php
+++ b/mod/groups/actions/leave.php
@@ -10,7 +10,7 @@ $group_guid = get_input('group_guid');
 
 $user = NULL;
 if (!$user_guid) {
-	$user = get_loggedin_user();
+	$user = elgg_get_logged_in_user_entity();
 } else {
 	$user = get_entity($user_guid);
 }
@@ -20,7 +20,7 @@ $group = get_entity($group_guid);
 set_page_owner($group->guid);
 
 if (($user instanceof ElggUser) && ($group instanceof ElggGroup)) {
-	if ($group->getOwnerGUID() != get_loggedin_userid()) {
+	if ($group->getOwnerGUID() != elgg_get_logged_in_user_guid()) {
 		if ($group->leave($user)) {
 			system_message(elgg_echo("groups:left"));
 		} else {