From 96bcaf4331153d911dff6d8c7265f1a8f3f01255 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 17 Aug 2011 18:43:17 -0700
Subject: [PATCH] poormancron - proc_run executing twice, once as function;
once as commandline
---
addon/poormancron/poormancron.php | 4 +++-
boot.php | 9 ++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/addon/poormancron/poormancron.php b/addon/poormancron/poormancron.php
index 7611c43be..e09182f99 100644
--- 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 39bb6a9da..158054884 100644
--- 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);
}