diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /util/typo.php | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
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'); |