Merge branch 'pull'

diff --git a/addon/poormancron/poormancron.php b/addon/poormancron/poormancron.php
index 7611c43befa0405943610967e351183f6bf083d5..e09182f992dbb45f65da0ef44cbb29583ceb1ee7 100644 (file)
--- a/addon/poormancron/poormancron.php
+++ b/addon/poormancron/poormancron.php
@@ -31,7 +31,9 @@ function poormancron_hook(&$a,&$b) {
     }
 }
 
-function poormancron_procrun(&$a, $argv) {
+function poormancron_procrun(&$a, &$arr) {
+       $argv = $arr['args'];
+       $arr['run_cmd'] = false;
        logger("poormancron procrun ".implode(", ",$argv));
        array_shift($argv);
        $argc = count($argv);

diff --git a/boot.php b/boot.php
index 39bb6a9dac875e4f77f3e36bb6cdd738e169a2ec..158054884b7d4d1c9ad0d0e92c58b880c054d77f 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -7,7 +7,7 @@ require_once('include/text.php');
 require_once("include/pgettext.php");
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1074' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1075' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1079      );
 
@@ -1033,11 +1033,14 @@ function proc_run($cmd){
        $a = get_app();
 
        $args = func_get_args();
-       call_hooks("proc_run", $args);
+       $arr = array('args' => $args, 'run_cmd' => true);
+
+       call_hooks("proc_run", $arr);
+       if(! $arr['run_cmd'])
+               return;
 
        if(count($args) && $args[0] === 'php')
         $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-       
        foreach ($args as $arg){
                $arg = escapeshellarg($arg);
        }