Merge branch 'master' of https://github.com/redmatrix/hubzilla

2015-10-02 17:52:14 +02:00 · 2015-10-02 17:52:14 +02:00 · 3a8bff228e
commit 3a8bff228e
parent 5ba39fef9a c7160e3d25
2 changed files with 400 additions and 382 deletions
--- a/include/notifier.php
+++ b/include/notifier.php
@ -687,7 +687,7 @@ function notifier_run($argv, $argc){
 	if($normal_mode) {
 		$x = q("select * from hook where hook = 'notifier_normal'");
 		if($x)
-			proc_run('php','deliver_hooks.php', $target_item['id']);
+			proc_run('php','include/deliver_hooks.php', $target_item['id']);
 	}

 	if($deliveries) {
--- a/util/hmessages.po
+++ b/util/hmessages.po