packages: dokuwiki/task-1821.patch - include @DIFFPAGE@ placeholder in emai...

[glen]

Author: glen                         Date: Mon Jan 11 12:49:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- include @DIFFPAGE@ placeholder in email template

---- Files affected:
packages/dokuwiki:
   task-1821.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/dokuwiki/task-1821.patch
diff -u packages/dokuwiki/task-1821.patch:1.1 packages/dokuwiki/task-1821.patch:1.2
--- packages/dokuwiki/task-1821.patch:1.1	Mon Jan 11 13:37:10 2010
+++ packages/dokuwiki/task-1821.patch	Mon Jan 11 13:49:33 2010
@@ -14,3 +14,14 @@
          $rev1 = (int) $_REQUEST['rev2'][0];
          $rev2 = (int) $_REQUEST['rev2'][1];
  
+--- dokuwiki/inc/common.php~	2010-01-11 14:48:54.000000000 +0200
++++ dokuwiki/inc/common.php	2010-01-11 14:48:58.213308444 +0200
+@@ -1128,6 +1128,8 @@
+   }elseif($rev){
+     $subject = $lang['mail_changed'].' '.$id;
+     $text = str_replace('@OLDPAGE@',wl($id,"rev=$rev",true,'&'),$text);
++    $rev2 = $INFO['meta']['date']['modified'];
++    $text = str_replace('@DIFFPAGE@',wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&'),$text);
+     require_once(DOKU_INC.'inc/DifferenceEngine.php');
+     $df  = new Diff(explode("\n",rawWiki($id,$rev)),
+                     explode("\n",rawWiki($id)));
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/task-1821.patch?r1=1.1&r2=1.2&f=u