aboutsummaryrefslogtreecommitdiffstats
path: root/mod/bookmarks.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-29 00:28:23 -0800
committerfriendica <info@friendica.com>2015-01-29 00:28:23 -0800
commitfd0b6c967fce4d8a82e9dad121ae7d8301d3f342 (patch)
tree5c37812ef7baeadc17fce088c4394d25f75b593c /mod/bookmarks.php
parentc993ddd86ee25832e35e65333fa25b396e7aefdf (diff)
parent872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff)
downloadvolse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.gz
volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.bz2
volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.zip
Merge branch 'master' into pocorate
Diffstat (limited to 'mod/bookmarks.php')
-rw-r--r--mod/bookmarks.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/mod/bookmarks.php b/mod/bookmarks.php
index 6b2476a8e..a5b9c473f 100644
--- a/mod/bookmarks.php
+++ b/mod/bookmarks.php
@@ -1,7 +1,7 @@
<?php
function bookmarks_init(&$a) {
- if(! local_user())
+ if(! local_channel())
return;
$item_id = intval($_REQUEST['item']);
if(! $item_id)
@@ -11,7 +11,7 @@ function bookmarks_init(&$a) {
$i = q("select * from item where id = %d and uid = %d limit 1",
intval($item_id),
- intval(local_user())
+ intval(local_channel())
);
if(! $i)
@@ -42,7 +42,7 @@ function bookmarks_init(&$a) {
}
function bookmarks_content(&$a) {
- if(! local_user()) {
+ if(! local_channel()) {
notice( t('Permission denied.') . EOL);
return;
}
@@ -59,11 +59,11 @@ function bookmarks_content(&$a) {
$o .= '<h3>' . t('My Bookmarks') . '</h3>';
- $x = menu_list(local_user(),'',MENU_BOOKMARK);
+ $x = menu_list(local_channel(),'',MENU_BOOKMARK);
if($x) {
foreach($x as $xx) {
- $y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
+ $y = menu_fetch($xx['menu_name'],local_channel(),get_observer_hash());
$o .= menu_render($y,'',true);
}
}
@@ -71,11 +71,11 @@ function bookmarks_content(&$a) {
$o .= '<h3>' . t('My Connections Bookmarks') . '</h3>';
- $x = menu_list(local_user(),'',MENU_SYSTEM|MENU_BOOKMARK);
+ $x = menu_list(local_channel(),'',MENU_SYSTEM|MENU_BOOKMARK);
if($x) {
foreach($x as $xx) {
- $y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
+ $y = menu_fetch($xx['menu_name'],local_channel(),get_observer_hash());
$o .= menu_render($y,'',true);
}
}