aboutsummaryrefslogtreecommitdiffstats
path: root/mod/notifications.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
committerfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
commit912be23e1627211fb417c4b7bced414cbbe38ef0 (patch)
tree2b8567d800624167b3eadf37c8855deb0ba74b0b /mod/notifications.php
parentff68ea608786a698ad46637ef13854ac1b1e6beb (diff)
parent872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff)
downloadvolse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.gz
volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.bz2
volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.zip
Merge branch 'master' into tres
Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php
Diffstat (limited to 'mod/notifications.php')
-rw-r--r--mod/notifications.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/mod/notifications.php b/mod/notifications.php
index 5507ee7e2..f679fbb3b 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -2,7 +2,7 @@
function notifications_post(&$a) {
- if(! local_user()) {
+ if(! local_channel()) {
goaway(z_root());
}
@@ -15,7 +15,7 @@ function notifications_post(&$a) {
$r = q("SELECT * FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($request_id),
- intval(local_user())
+ intval(local_channel())
);
if(count($r)) {
@@ -43,7 +43,7 @@ function notifications_post(&$a) {
$r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1",
intval($contact_id),
- intval(local_user())
+ intval(local_channel())
);
}
goaway($a->get_baseurl(true) . '/notifications/intros');
@@ -62,7 +62,7 @@ function notifications_post(&$a) {
function notifications_content(&$a) {
- if(! local_user()) {
+ if(! local_channel()) {
notice( t('Permission denied.') . EOL);
return;
}
@@ -77,7 +77,7 @@ function notifications_content(&$a) {
require_once('include/bbcode.php');
$r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc",
- intval(local_user())
+ intval(local_channel())
);
if (count($r) > 0) {