aboutsummaryrefslogtreecommitdiff
path: root/mod/pages
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-08 19:52:10 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-08 19:52:10 +0000
commitccb6d625239b59b283b4d3fc00da704ab743d74c (patch)
treeda9b11d8758b3007c025e4d5487410ae1ca69f68 /mod/pages
parent1368785a6b6f9c946dcc5eca078540bacce71f60 (diff)
downloadelgg-ccb6d625239b59b283b4d3fc00da704ab743d74c.tar.gz
elgg-ccb6d625239b59b283b4d3fc00da704ab743d74c.tar.bz2
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
Diffstat (limited to 'mod/pages')
-rw-r--r--mod/pages/actions/pages/edit.php2
-rw-r--r--mod/pages/index.php2
-rw-r--r--mod/pages/start.php4
3 files changed, 4 insertions, 4 deletions
diff --git a/mod/pages/actions/pages/edit.php b/mod/pages/actions/pages/edit.php
index e8e7a254a..6950d4b2f 100644
--- a/mod/pages/actions/pages/edit.php
+++ b/mod/pages/actions/pages/edit.php
@@ -69,7 +69,7 @@ if ($page->save()) {
system_message(elgg_echo('pages:saved'));
if ($new_page) {
- add_to_river('river/object/page/create', 'create', get_loggedin_userid(), $page->guid);
+ add_to_river('river/object/page/create', 'create', elgg_get_logged_in_user_guid(), $page->guid);
}
forward($page->getURL());
diff --git a/mod/pages/index.php b/mod/pages/index.php
index afda594cb..ff5a78311 100644
--- a/mod/pages/index.php
+++ b/mod/pages/index.php
@@ -32,7 +32,7 @@ if (!$content) {
}
$filter_context = '';
-if (elgg_get_page_owner_guid() == get_loggedin_userid()) {
+if (elgg_get_page_owner_guid() == elgg_get_logged_in_user_guid()) {
$filter_context = 'mine';
}
diff --git a/mod/pages/start.php b/mod/pages/start.php
index 4a48368ec..31288e040 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -275,7 +275,7 @@ function pages_container_permission_check($hook, $entity_type, $returnvalue, $pa
if (elgg_get_context() == "pages") {
if (elgg_get_page_owner_guid()) {
- if (can_write_to_container(get_loggedin_userid(), elgg_get_page_owner_guid())) return true;
+ if (can_write_to_container(elgg_get_logged_in_user_guid(), elgg_get_page_owner_guid())) return true;
}
if ($page_guid = get_input('page_guid',0)) {
$entity = get_entity($page_guid);
@@ -284,7 +284,7 @@ function pages_container_permission_check($hook, $entity_type, $returnvalue, $pa
}
if ($entity instanceof ElggObject) {
if (
- can_write_to_container(get_loggedin_userid(), $entity->container_guid)
+ can_write_to_container(elgg_get_logged_in_user_guid(), $entity->container_guid)
|| in_array($entity->write_access_id,get_access_list())
) {
return true;