diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-03-09 23:21:34 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-03-09 23:21:34 +0100 |
| commit | 73fdb760c1e87630713494179cc547916696746a (patch) | |
| tree | dafa3e830ae9c7d80461497859fef5be7de438eb /mod/directory.php | |
| parent | 1d59924f4dfe729ef436c715c80482acb4b55581 (diff) | |
| parent | 4936beb259c2e36006eac476ce007b86660adf76 (diff) | |
| download | volse-hubzilla-73fdb760c1e87630713494179cc547916696746a.tar.gz volse-hubzilla-73fdb760c1e87630713494179cc547916696746a.tar.bz2 volse-hubzilla-73fdb760c1e87630713494179cc547916696746a.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/directory.php')
| -rw-r--r-- | mod/directory.php | 15 |
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)) |