aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/features.php2
-rw-r--r--include/security.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/features.php b/include/features.php
index efdf6dc3a..973fe9fe7 100644
--- a/include/features.php
+++ b/include/features.php
@@ -7,6 +7,8 @@
function feature_enabled($uid,$feature) {
$x = get_pconfig($uid,'feature',$feature);
+ if($x === false)
+ $x = get_config('feature',$feature);
$arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x);
call_hooks('feature_enabled',$arr);
return($arr['enabled']);
diff --git a/include/security.php b/include/security.php
index 4a15e52af..5e86cf790 100644
--- a/include/security.php
+++ b/include/security.php
@@ -61,7 +61,7 @@ function change_channel($change_channel) {
intval(PAGE_REMOVED)
);
- if($r) {
+ if($r) {
$hash = $r[0]['channel_hash'];
$_SESSION['uid'] = intval($r[0]['channel_id']);
get_app()->set_channel($r[0]);