X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=task-1821.patch;h=08257be1c346e00041b36eef45ef4f9ed15e8192;hb=5b9dd55263a1bad56171e30b57fde3394f2a4eaa;hp=868412bf2353ad1705869dc0da0ea95a7818473a;hpb=74e18a1001a57c267c531266a4d171125542f3f3;p=packages%2Fdokuwiki.git

diff --git a/task-1821.patch b/task-1821.patch
index 868412b..08257be 100644
--- a/task-1821.patch
+++ b/task-1821.patch
@@ -1,46 +1,54 @@
---- 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 @@
+TODO:
+use rev1, rev2
+http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev2=&difftype=sidebyside
+
+--- 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'];
+-
+     $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];
  
--    if(is_array($_REQUEST['rev2'])){
-+	} else if(is_array($_REQUEST['rev2'])){
-         $rev1 = (int) $_REQUEST['rev2'][0];
-         $rev2 = (int) $_REQUEST['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
+@@ -1030,8 +1030,8 @@
  
---- dokuwiki/inc/html.php~	2010-10-07 21:48:30.000000000 +0300
-+++ dokuwiki/inc/html.php	2010-10-18 17:28:03.106448956 +0300
-@@ -997,7 +997,7 @@
-     if($intro) print p_locale_xhtml('diff');
- 
-     if (!$text) {
--        $diffurl = wl($ID, array('do'=>'diff', 'rev2[0]'=>$l_rev, 'rev2[1]'=>$r_rev));
-+        $diffurl = wl($ID, array('do'=>'diff', 'r1'=>$l_rev, 'r2'=>$r_rev));
-         ptln('<p class="difflink">');
-         ptln('  <a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a>');
-         ptln('</p>');
---- 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);
+         $diffurl = wl($ID, array(
+                         'do'       => 'diff',
+-                        'rev2[0]'  => $l_rev,
+-                        'rev2[1]'  => $r_rev,
++                        'r1'       => $l_rev,
++                        'r2'       => $r_rev,
+                         'difftype' => $type,
+                       ));
+         ptln('<br /><a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a>');
+--- dokuwiki-2012-09-08/inc/common.php~	2012-09-08 17:57:46.000000000 +0300
++++ dokuwiki-2012-09-08/inc/common.php	2012-09-08 17:58:26.151228475 +0300
+@@ -1179,6 +1179,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,'&');
+         $old_content     = rawWiki($id, $rev);
+         $new_content     = rawWiki($id);
+         $df              = new Diff(explode("\n", $old_content),
+@@ -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);