aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--inc/Subscriptions/SubscriberManager.php5
-rw-r--r--inc/common.php8
2 files changed, 7 insertions, 6 deletions
diff --git a/inc/Subscriptions/SubscriberManager.php b/inc/Subscriptions/SubscriberManager.php
index 138176fe9..ded1390cf 100644
--- a/inc/Subscriptions/SubscriberManager.php
+++ b/inc/Subscriptions/SubscriberManager.php
@@ -124,6 +124,11 @@ class SubscriberManager
$user = $INPUT->server->str('REMOTE_USER');
}
+ if (empty($user)) {
+ // not logged in
+ return false;
+ }
+
$subs = $this->subscribers($id, $user);
if (!count($subs)) {
return false;
diff --git a/inc/common.php b/inc/common.php
index c462934b2..1572736de 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -217,12 +217,8 @@ function pageinfo() {
$info['id'] = $ID;
$info['rev'] = $REV;
- if($INPUT->server->has('REMOTE_USER')) {
- $subManager = new SubscriberManager();
- $info['subscribed'] = $subManager->userSubscription();
- } else {
- $info['subscribed'] = false;
- }
+ $subManager = new SubscriberManager();
+ $info['subscribed'] = $subManager->userSubscription();
$info['locked'] = checklock($ID);
$info['filepath'] = wikiFN($ID);