X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=task-1821.patch;fp=task-1821.patch;h=b224f88a000f73e1202fbd96d08c2ee45ae3575e;hb=4e1fe290e9edfecb1bdc2309b215f4e0e407c1b9;hp=8e33b935198fbe82e339b411e3bd9cd1277baa50;hpb=e38f954582a6ea8ac4b5f077d960f3db4d8492a4;p=packages%2Fdokuwiki.git

diff --git a/task-1821.patch b/task-1821.patch
index 8e33b93..b224f88 100644
--- a/task-1821.patch
+++ b/task-1821.patch
@@ -1,18 +1,20 @@
---- dokuwiki/inc/html.php~	2010-01-11 14:35:04.000000000 +0200
-+++ dokuwiki/inc/html.php	2010-01-11 14:35:07.213389784 +0200
-@@ -862,8 +862,12 @@
+--- dokuwiki-2012-07-16/inc/html.php~	2012-07-16 11:47:58.000000000 +0300
++++ dokuwiki-2012-07-16/inc/html.php	2012-07-16 11:53:24.640163788 +0300
+@@ -1086,9 +1086,13 @@
      // given as rev and rev2 parameters, with rev2 being optional. Or in an
      // array in rev2.
      $rev1 = $REV;
-+	// handle $r1 + $r2, see DW #1821
-+	if (isset($_REQUEST['r1']) && isset($_REQUEST['r2'])) {
-+        $rev1 = (int) $_REQUEST['r1'];
-+        $rev2 = (int) $_REQUEST['r2'];
- 
--    if(is_array($_REQUEST['rev2'])){
-+	} else if(is_array($_REQUEST['rev2'])){
-         $rev1 = (int) $_REQUEST['rev2'][0];
-         $rev2 = (int) $_REQUEST['rev2'][1];
+-
+     $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];
  
 --- dokuwiki-20110329/inc/html.php~	2011-03-29 09:20:42.000000000 +0300
 +++ dokuwiki-20110329/inc/html.php	2011-03-29 09:21:51.507042136 +0300
@@ -27,22 +29,22 @@
                          'difftype' => $type,
                        ));
          ptln('<br /><a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a>');
---- dokuwiki-rc2010-10-07/inc/common.php~	2010-10-07 21:41:20.000000000 +0300
-+++ dokuwiki-rc2010-10-07/inc/common.php	2010-10-07 21:45:00.639114275 +0300
-@@ -1147,6 +1147,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);
-         $df  = new Diff(explode("\n",rawWiki($id,$rev)),
-                         explode("\n",rawWiki($id)));
-         $dformat = new UnifiedDiffFormatter();
-@@ -1154,6 +1156,7 @@
-     }else{
-         $subject=$lang['mail_newpage'].' '.$id;
-         $text = str_replace('@OLDPAGE@','none',$text);
-+        $text = str_replace('@DIFFPAGE@','none',$text);
-         $diff = rawWiki($id);
+--- dokuwiki-2012-07-16/inc/common.php~	2012-07-16 11:55:03.000000000 +0300
++++ dokuwiki-2012-07-16/inc/common.php	2012-07-16 11:58:26.626127713 +0300
+@@ -1178,6 +1178,8 @@
+     } elseif($rev) {
+         $subject         = $lang['mail_changed'].' '.$id;
+         $trep['OLDPAGE'] = wl($id, "rev=$rev", true, '&');
++        $rev2            = $INFO['meta']['date']['modified'];
++        $trep['DIFFPAGE']= wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&');
+         $df              = new Diff(explode("\n", rawWiki($id, $rev)),
+                                     explode("\n", rawWiki($id)));
+         $dformat         = new UnifiedDiffFormatter();
+@@ -1191,6 +1193,7 @@
+     } else {
+         $subject         = $lang['mail_newpage'].' '.$id;
+         $trep['OLDPAGE'] = '---';
++        $trep['DIFFPAGE']= '---';
+         $tdiff           = rawWiki($id);
+         $hdiff           = nl2br(hsc($tdiff));
      }
-     $text = str_replace('@DIFF@',$diff,$text);