diff options
| author | Devlon Duthie <duthied@gmail.com> | 2011-10-02 18:39:53 -0500 |
|---|---|---|
| committer | Devlon Duthie <duthied@gmail.com> | 2011-10-02 18:39:53 -0500 |
| commit | 8e38fe6f47db54e7af12707130641e8de9f3eeb9 (patch) | |
| tree | 5b2b4fadf9adc716bf7c94dc864c9403007a8c84 /include | |
| parent | f6f5e5b99389019bdd6a3258de19cdda2d014b97 (diff) | |
| parent | 7c1968907d26a66581d362475a6b557e53e159cb (diff) | |
| download | volse-hubzilla-8e38fe6f47db54e7af12707130641e8de9f3eeb9.tar.gz volse-hubzilla-8e38fe6f47db54e7af12707130641e8de9f3eeb9.tar.bz2 volse-hubzilla-8e38fe6f47db54e7af12707130641e8de9f3eeb9.zip | |
Merge branch 'master' of http://github.com/friendika/Free-Friendika
Diffstat (limited to 'include')
| -rw-r--r-- | include/delivery.php | 2 | ||||
| -rw-r--r-- | include/notifier.php | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/delivery.php b/include/delivery.php index 3ab820b62..46112d78e 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -96,6 +96,8 @@ function delivery_run($argv, $argc){ $uid = $r[0]['uid']; $updated = $r[0]['edited']; + if(! $parent_id) + return; $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` diff --git a/include/notifier.php b/include/notifier.php index 864fa517b..d1cd1cc73 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -123,6 +123,9 @@ function notifier_run($argv, $argc){ $uid = $r[0]['uid']; $updated = $r[0]['edited']; + if(! $parent_id) + return; + $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d ORDER BY `id` ASC", intval($parent_id) |