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

4 files changed, 6 insertions, 6 deletions

diff --git a/mod/file/actions/file/upload.php b/mod/file/actions/file/upload.php
index 5ce98c101..1a30b6cef 100644
--- a/mod/file/actions/file/upload.php
+++ b/mod/file/actions/file/upload.php
@@ -16,7 +16,7 @@ $tags = get_input("tags");
 $ajax = get_input('ajax', FALSE);
 
 if ($container_guid == 0) {
-	$container_guid = get_loggedin_userid();
+	$container_guid = elgg_get_logged_in_user_guid();
 }
 
 elgg_make_sticky_form('file');
@@ -166,7 +166,7 @@ if ($new_file) {
 
 		} else {
 			system_message($message);
-			add_to_river('river/object/file/create', 'create', get_loggedin_userid(), $file->guid);
+			add_to_river('river/object/file/create', 'create', elgg_get_logged_in_user_guid(), $file->guid);
 		}
 	} else {
 		// failed to save file object - nothing we can do about this
diff --git a/mod/file/index.php b/mod/file/index.php
index 44906d72d..4a8e35bdb 100644
--- a/mod/file/index.php
+++ b/mod/file/index.php
@@ -17,7 +17,7 @@ elgg_push_breadcrumb($owner->name);
 
 $params = array();
 
-if ($owner->guid == get_loggedin_userid()) {
+if ($owner->guid == elgg_get_logged_in_user_guid()) {
 	// user looking at own files
 	$title = elgg_echo('file:yours');
 	$params['filter_context'] = 'mine';
@@ -31,7 +31,7 @@ if ($owner->guid == get_loggedin_userid()) {
 	// group files
 	$title = elgg_echo("file:user", array($owner->name));
 	$params['filter'] = '';
-	if ($owner->isMember(get_loggedin_user())) {
+	if ($owner->isMember(elgg_get_logged_in_user_entity())) {
 		$url = "pg/file/add/$owner->guid";
 		$vars = array(
 			'href' => $url,
diff --git a/mod/file/start.php b/mod/file/start.php
index 360f64d1f..cea8b6bd5 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -364,7 +364,7 @@ function file_embed_get_sections($hook, $type, $value, $params) {
  */
 function file_embed_get_items($hook, $type, $value, $params) {
 	$options = array(
-		'owner_guid' => get_loggedin_userid(),
+		'owner_guid' => elgg_get_logged_in_user_guid(),
 		'type_subtype_pair' => array('object' => 'file'),
 		'count' => TRUE
 	);
diff --git a/mod/file/views/default/file/embed_upload.php b/mod/file/views/default/file/embed_upload.php
index 8a54a4fa9..229fcd40b 100644
--- a/mod/file/views/default/file/embed_upload.php
+++ b/mod/file/views/default/file/embed_upload.php
@@ -3,7 +3,7 @@
  * Files upload form for embed
  */
 
-$access_id = get_default_access(get_loggedin_user());
+$access_id = get_default_access(elgg_get_logged_in_user_entity());
 if ($categories = elgg_view('categories', $vars)) {
 	$categories = "<p>$categories</p>";
 }