diff options
author | Andrew Manning <tamanning@zoho.com> | 2016-04-03 21:36:29 -0400 |
---|---|---|
committer | Andrew Manning <tamanning@zoho.com> | 2016-04-03 21:36:29 -0400 |
commit | 0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f (patch) | |
tree | a92197de4503ec52889dc05483493f4df1a305b8 /util/typo.php | |
parent | 99d9456b3addc651a68874ddd391d25684252c4d (diff) | |
parent | b4c1baada1fba46d4d75f40a7e78111d70d54e7a (diff) | |
download | volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.gz volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.bz2 volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.zip |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
Diffstat (limited to 'util/typo.php')
-rw-r--r-- | util/typo.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/util/typo.php b/util/typo.php index 2e25c8306..0f7249f5c 100644 --- a/util/typo.php +++ b/util/typo.php @@ -10,7 +10,9 @@ include 'boot.php'; - $a = new App(); + App::init(); + +// $a = new App(); echo "Directory: include\n"; $files = glob('include/*.php'); @@ -67,8 +69,8 @@ } } - if(x($a->config,'system') && x($a->config['system'],'php_path')) - $phpath = $a->config['system']['php_path']; + if(x(App::$config,'system') && x(App::$config['system'],'php_path')) + $phpath = App::$config['system']['php_path']; else $phpath = 'php'; @@ -76,7 +78,7 @@ echo 'util/hstrings.php' . "\n"; include_once('util/hstrings.php'); - echo count($a->strings) . ' strings' . "\n"; + echo count(App::$strings) . ' strings' . "\n"; $files = glob('view/*/hstrings.php'); |