aboutsummaryrefslogtreecommitdiff
path: root/mod/bookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'mod/bookmarks')
-rw-r--r--mod/bookmarks/bookmarklet.php4
-rw-r--r--mod/bookmarks/pages/all.php2
-rw-r--r--mod/bookmarks/pages/owner.php2
-rw-r--r--mod/bookmarks/start.php6
-rw-r--r--mod/bookmarks/views/default/bookmarks/bookmarklet.php2
-rw-r--r--mod/bookmarks/views/default/bookmarks/owner_block.php2
6 files changed, 9 insertions, 9 deletions
diff --git a/mod/bookmarks/bookmarklet.php b/mod/bookmarks/bookmarklet.php
index a156cf035..9f9dd5150 100644
--- a/mod/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/bookmarklet.php
@@ -13,8 +13,8 @@ gatekeeper();
// Get the current page's owner
$page_owner = elgg_get_page_owner_entity();
-if ($page_owner === false || is_null($page_owner) && (get_loggedin_user())) {
- $page_owner = get_loggedin_user();
+if ($page_owner === false || is_null($page_owner) && (elgg_get_logged_in_user_entity())) {
+ $page_owner = elgg_get_logged_in_user_entity();
set_page_owner($page_owner->getGUID());
}
diff --git a/mod/bookmarks/pages/all.php b/mod/bookmarks/pages/all.php
index 2bde462ba..3442f32c7 100644
--- a/mod/bookmarks/pages/all.php
+++ b/mod/bookmarks/pages/all.php
@@ -10,7 +10,7 @@ elgg_push_breadcrumb(elgg_echo('bookmarks'));
$page_owner = elgg_get_page_owner_entity();
if (!$page_owner) {
- $page_owner = get_loggedin_userid();
+ $page_owner = elgg_get_logged_in_user_guid();
elgg_set_page_owner_guid($page_owner);
}
diff --git a/mod/bookmarks/pages/owner.php b/mod/bookmarks/pages/owner.php
index 1e45bc518..5b864ff48 100644
--- a/mod/bookmarks/pages/owner.php
+++ b/mod/bookmarks/pages/owner.php
@@ -10,7 +10,7 @@ elgg_push_breadcrumb(elgg_echo('bookmarks'), 'pg/bookmarks/all');
$page_owner = elgg_get_page_owner_entity();
if (!$page_owner) {
- $page_owner = get_loggedin_userid();
+ $page_owner = elgg_get_logged_in_user_guid();
elgg_set_page_owner_guid($page_owner);
}
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index b7e2e5df9..04a452d32 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -59,10 +59,10 @@ function bookmarks_pagesetup() {
//add submenu options
if (get_context() == "bookmarks") {
- if (isloggedin()) {
+ if (elgg_is_logged_in()) {
// link to add bookmark form
if ($page_owner instanceof ElggGroup) {
- if ($page_owner->isMember(get_loggedin_user())) {
+ if ($page_owner->isMember(elgg_get_logged_in_user_entity())) {
add_submenu_item(elgg_echo('bookmarks:add'), $CONFIG->wwwroot."pg/bookmarks/add/" . $page_owner->username);
}
} else {
@@ -82,7 +82,7 @@ function bookmarks_pagesetup() {
}
// Bookmarklet
- if ((isloggedin()) && (page_owner()) && (can_write_to_container(0, page_owner()))) {
+ if ((elgg_is_logged_in()) && (page_owner()) && (can_write_to_container(0, page_owner()))) {
$bmtext = elgg_echo('bookmarks:bookmarklet');
if ($page_owner instanceof ElggGroup) {
diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
index bb2cf885e..531619409 100644
--- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
@@ -15,7 +15,7 @@ if ($page_owner instanceof ElggGroup) {
$name = $page_owner->username;
}
-if (!$name && ($user = get_loggedin_user())) {
+if (!$name && ($user = elgg_get_logged_in_user_entity())) {
$name = $user->username;
}
diff --git a/mod/bookmarks/views/default/bookmarks/owner_block.php b/mod/bookmarks/views/default/bookmarks/owner_block.php
index 654ff9152..d9b31d8d4 100644
--- a/mod/bookmarks/views/default/bookmarks/owner_block.php
+++ b/mod/bookmarks/views/default/bookmarks/owner_block.php
@@ -1,7 +1,7 @@
<?php
$label = elgg_echo('bookmarks:this');
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
$url = "'" . $vars['url'] . "pg/bookmarks/add/{$user->username}?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)";
?>