diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2014-06-24 19:34:36 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2014-06-24 19:34:36 +0200 |
| commit | b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70 (patch) | |
| tree | 718df6305bcb82c8dcb4b287a7132422e748cdfb /util/typo.php | |
| parent | c2d520f1be115fb3cb5da2a35eb10146cecee8aa (diff) | |
| parent | a92fb0b04c3e6474ec48faf8e4cc65c382e89d66 (diff) | |
| download | volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.tar.gz volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.tar.bz2 volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'util/typo.php')
| -rw-r--r-- | util/typo.php | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/util/typo.php b/util/typo.php index bb2fc67c9..6c846696d 100644 --- a/util/typo.php +++ b/util/typo.php @@ -12,15 +12,29 @@ $a = new App(); - echo "Directory: mod\n"; - $files = glob('mod/*.php'); + echo "Directory: include\n"; + $files = glob('include/*.php'); foreach($files as $file) { echo $file . "\n"; include_once($file); } - echo "Directory: include\n"; - $files = glob('include/*.php'); + echo "Directory: include/dba\n"; + $files = glob('include/dba/*.php'); + foreach($files as $file) { + echo $file . "\n"; + include_once($file); + } + + echo "Directory: include/photo\n"; + $files = glob('include/photo/*.php'); + foreach($files as $file) { + echo $file . "\n"; + include_once($file); + } + + echo "Directory: mod\n"; + $files = glob('mod/*.php'); foreach($files as $file) { echo $file . "\n"; include_once($file); @@ -38,8 +52,8 @@ } } - if(x($a->config,'php_path')) - $phpath = $a->config['php_path']; + if(x($a->config,'system') && x($a->config['system'],'php_path')) + $phpath = $a->config['system']['php_path']; else $phpath = 'php'; |