- refer to upstream pull

[packages/dokuwiki.git] / dokuwiki-notifyns.patch

diff --git a/dokuwiki-notifyns.patch b/dokuwiki-notifyns.patch
index 631970f850b0013bc07738afdb1aad0679ea6ad7..2f7bd7fa40b3484372f8bc724f7cd455aa0f5b9d 100644 (file)
--- a/dokuwiki-notifyns.patch
+++ b/dokuwiki-notifyns.patch
@@ -1,5 +1,5 @@
---- dokuwiki-rc2010-10-07/inc/common.php~      2010-10-07 21:31:18.000000000 +0300
-+++ dokuwiki-rc2010-10-07/inc/common.php       2010-10-07 21:33:06.502518916 +0300
+--- dokuwiki-2012-07-08/inc/common.php~        2012-07-08 11:24:16.000000000 +0300
++++ dokuwiki-2012-07-08/inc/common.php 2012-07-08 11:25:44.509886848 +0300
 @@ -902,6 +902,34 @@
    return $date;
  }
@@ -35,28 +35,28 @@
  /**
   * Sends a notify mail on page change
   *
-@@ -1100,10 +1100,10 @@
+@@ -1137,10 +1137,10 @@
  
-     // decide if there is something to do
-     if($who == 'admin'){
--        if(empty($conf['notify'])) return; //notify enabled?
+     // decide if there is something to do, eg. whom to mail
+     if($who == 'admin') {
+-        if(empty($conf['notify'])) return false; //notify enabled?
          if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return; //skip minors
 +        $to   = notifyNS($id, $conf['notify']);
 +        if(empty($to)) return; //notify enabled?
          $text = rawLocale('mailtext');
 -        $to   = $conf['notify'];
          $bcc  = '';
-     }elseif($who == 'subscribers'){
-         if(!$conf['subscribers']) return; //subscribers enabled?
-@@ -1116,9 +1116,9 @@
+     } elseif($who == 'subscribers') {
+         if(!$conf['subscribers']) return false; //subscribers enabled?
+@@ -1155,9 +1155,9 @@
          $to   = '';
          $text = rawLocale('subscr_single');
-     }elseif($who == 'register'){
--        if(empty($conf['registernotify'])) return;
+     } elseif($who == 'register') {
+-        if(empty($conf['registernotify'])) return false;
 +        $to   = notifyNS($id, $conf['registernotify']);
 +        if(empty($to)) return;
          $text = rawLocale('registermail');
 -        $to   = $conf['registernotify'];
          $bcc  = '';
-     }else{
-         return; //just to be safe
+     } else {
+         return false; //just to be safe