diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-03-14 22:50:30 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-03-14 22:50:30 +0000 |
| commit | d07971b909363dd82faee3e4b5a218cb21d376dc (patch) | |
| tree | 1d4b76c4ed24bf3c8cbb81c73069eb8ab4b2644c /util/typo.php | |
| parent | fbc5260995866c280fbc48bfb7899836f46136f4 (diff) | |
| parent | ffcba3db81d85ae8bdc56f1772c7675aef56c78e (diff) | |
| download | volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.tar.gz volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.tar.bz2 volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
Diffstat (limited to 'util/typo.php')
| -rw-r--r-- | util/typo.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/typo.php b/util/typo.php index c4d038ce8..fac60e8ec 100644 --- a/util/typo.php +++ b/util/typo.php @@ -38,8 +38,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'; |