uses adldap 4.0.4 internally

[packages/dokuwiki.git] / task-1821.patch

adds: @DIFFPAGE@ placeholder to templates

TODO:
use rev1, rev2
http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev2=&difftype=sidebyside

--- dokuwiki-2014-05-06/inc/html.php	2014-05-08 11:27:02.548232655 +0300
+++ dokuwiki-2014-05-06/inc/html.php	2014-05-08 11:27:02.548232655 +0300
@@ -1134,7 +1134,13 @@
     $rev1 = $REV;
 
     $rev2 = $INPUT->ref('rev2');
-    if(is_array($rev2)) {
+
+    // handle $r1 + $r2, see DW #1821
+    if ($INPUT->has('r1') && $INPUT->has('r2')) {
+        $rev1 = $INPUT->int('r1');
+        $rev2 = $INPUT->int('r2');
+
+    } elseif(is_array($rev2)){
         $rev1 = (int) $rev2[0];
         $rev2 = (int) $rev2[1];
 
@@ -1458,8 +1464,8 @@
     } else {
         $urlparam = array(
             'do' => 'diff',
-            'rev2[0]' => $lrev,
-            'rev2[1]' => $rrev,
+            'r1' => $lrev,
+            'r2' => $rrev,
             'difftype' => $difftype,
         );
     }
--- dokuwiki/inc/subscription.php	2013-05-29 22:02:46.801329978 +0300
+++ dokuwiki/inc/subscription.php	2013-05-29 23:04:29.374883349 +0300
@@ -384,12 +384,13 @@
      * @return bool                     true if successfully sent
      */
     public function send_diff($subscriber_mail, $template, $id, $rev = null, $summary = '') {
-        global $DIFF_INLINESTYLES;
+        global $DIFF_INLINESTYLES, $INFO;
 
         // prepare replacements (keys not set in hrep will be taken from trep)
+        $rev2 = $INFO['meta']['date']['modified'];
         $trep = array(
             'PAGE' => $id,
-            'NEWPAGE' => wl($id, '', true, '&'),
+            'NEWPAGE' => wl($id, "rev=$rev2", true, '&'),
             'SUMMARY' => $summary,
             'SUBSCRIBE' => wl($id, array('do' => 'subscribe'), true, '&')
         );
@@ -398,6 +399,7 @@
         if($rev) {
             $subject = 'changed';
             $trep['OLDPAGE'] = wl($id, "rev=$rev", true, '&');
+            $trep['DIFFPAGE']= wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&');
 
             $old_content = rawWiki($id, $rev);
             $new_content = rawWiki($id);
@@ -417,6 +419,7 @@
         } else {
             $subject = 'newpage';
             $trep['OLDPAGE'] = '---';
+            $trep['DIFFPAGE']= '---';
             $tdiff = rawWiki($id);
             $hdiff = nl2br(hsc($tdiff));
         }