Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / util / typo.php

diff --git a/util/typo.php b/util/typo.php
index 84a50e15e236b0d68b6c08557d94884cb609b618..7c275f3ca32e6629488e407e67bf5324454d05bc 100644 (file)
--- a/util/typo.php
+++ b/util/typo.php
@@ -33,10 +33,17 @@
                $files = glob($dir . '/*.php');
                foreach($files as $file) {
                        echo $file . "\n";
+                       if(stristr($file,'jappixmini/proxy.php'))
+                               continue;
                        include_once($file);
                }
        }
 
+       if(x($a->config,'php_path'))
+               $phpath = $a->config['php_path'];
+       else
+               $phpath = 'php';
+
        echo "String files\n";
 
        echo 'util/strings.php' . "\n";
@@ -47,5 +54,6 @@
 
        foreach($files as $file) {
                echo $file . "\n";
-               include_once($file);
+       passthru($phpath . ' util/typohelper.php ' . $file);
+//             include_once($file);
        }