Ignore small & own changes in digest & list mails

1 files changed, 10 insertions, 11 deletions

diff --git a/inc/subscription.php b/inc/subscription.php
index ce5da4cd4..22d8fccd5 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -284,20 +284,18 @@ function subscription_addresslist(&$data){
  * Sends a digest mail showing a bunch of changes.
  *
  * @param string $subscriber_mail The target mail address
- * @param array  $change          The newest change
+ * @param array  $id              The ID
  * @param int    $lastupdate      Time of the last notification
  *
  * @author Adrian Lang <lang@cosmocode.de>
  */
-function subscription_send_digest($subscriber_mail, $change, $lastupdate) {
-    $id = $change['id'];
+function subscription_send_digest($subscriber_mail, $id, $lastupdate) {
     $n = 0;
     do {
         $rev = getRevisions($id, $n++, 1);
         $rev = (count($rev) > 0) ? $rev[0] : null;
     } while (!is_null($rev) && $rev > $lastupdate);
 
-    $ip = $change['ip'];
     $replaces = array('NEWPAGE'   => wl($id, '', true, '&'),
                       'SUBSCRIBE' => wl($id, array('do' => 'subscribe'), true, '&'));
     if (!is_null($rev)) {
@@ -322,24 +320,25 @@ function subscription_send_digest($subscriber_mail, $change, $lastupdate) {
  * Sends a list mail showing a list of changed pages.
  *
  * @param string $subscriber_mail The target mail address
- * @param array  $changes         Array of changes
- * @param string $id              The id of the namespace
+ * @param array  $ids             Array of ids
+ * @param string $ns_id           The id of the namespace
  *
  * @author Adrian Lang <lang@cosmocode.de>
  */
-function subscription_send_list($subscriber_mail, $changes, $id) {
+function subscription_send_list($subscriber_mail, $ids, $ns_id) {
+    if (count($ids) === 0) return;
     global $conf;
     $list = '';
-    foreach ($changes as $change) {
-        $list .= '* ' . wl($change['id'], array(), true) . NL;
+    foreach ($ids as $id) {
+        $list .= '* ' . wl($id, array(), true) . NL;
     }
     subscription_send($subscriber_mail,
                       array('DIFF'      => rtrim($list),
-                            'SUBSCRIBE' => wl($id . $conf['start'],
+                            'SUBSCRIBE' => wl($ns_id . $conf['start'],
                                               array('do' => 'subscribe'),
                                               true, '&')),
                       'subscribe_list',
-                      prettyprint_id($id),
+                      prettyprint_id($ns_id),
                       'subscr_list');
 }