aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-09 15:16:52 -0700
committerfriendica <info@friendica.com>2015-03-09 15:16:52 -0700
commite7d32442762dfda9a65468fb448fcd7e4ec5566a (patch)
tree2925930d73fe0abd18ec1ac981840defe010bc86 /mod
parentaff75888326e8f3ff2b9fbb91d653c7857940e6b (diff)
downloadvolse-hubzilla-e7d32442762dfda9a65468fb448fcd7e4ec5566a.tar.gz
volse-hubzilla-e7d32442762dfda9a65468fb448fcd7e4ec5566a.tar.bz2
volse-hubzilla-e7d32442762dfda9a65468fb448fcd7e4ec5566a.zip
Allow site to over-ride directory options. Bugger off.
Diffstat (limited to 'mod')
-rw-r--r--mod/directory.php15
1 files changed, 2 insertions, 13 deletions
diff --git a/mod/directory.php b/mod/directory.php
index 17a1776fe..d186a778d 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -48,21 +48,10 @@ function directory_content(&$a) {
return;
}
- $safe_mode = 1;
-
$observer = get_observer_hash();
- if($observer)
- $globaldir = get_xconfig($observer,'directory','globaldir');
- else
- $globaldir = ((array_key_exists('globaldir',$_SESSION)) ? intval($_SESSION['globaldir']) : false);
-
- if($observer)
- $safe_mode = get_xconfig($observer,'directory','safe_mode');
- else
- $safe_mode = ((array_key_exists('safemode',$_SESSION)) ? intval($_SESSION['safemode']) : false);
- if($safe_mode === false)
- $safe_mode = 1;
+ $globaldir = get_globaldir_setting($observer);
+ $safe_mode = get_safemode_setting($observer);
$pubforums = null;
if(array_key_exists('pubforums',$_REQUEST))