harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow site to over-ride directory options. Bugger off.

Browse Source
This commit is contained in:
friendica
2015-03-09 15:16:52 -07:00
parent aff7588832
commit e7d3244276
2 changed files with 33 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mod/directory.php
View File

@@ -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))