task-1821.patch

   1 --- dokuwiki/inc/html.php~      2010-01-11 14:35:04.000000000 +0200
   2 +++ dokuwiki/inc/html.php       2010-01-11 14:35:07.213389784 +0200
   3 @@ -862,8 +862,12 @@
   4      // given as rev and rev2 parameters, with rev2 being optional. Or in an
   5      // array in rev2.
   6      $rev1 = $REV;
   7 +       // handle $r1 + $r2, see DW #1821
   8 +       if (isset($_REQUEST['r1']) && isset($_REQUEST['r2'])) {
   9 +        $rev1 = (int) $_REQUEST['r1'];
  10 +        $rev2 = (int) $_REQUEST['r2'];
  11
  12 -    if(is_array($_REQUEST['rev2'])){
  13 +       } else if(is_array($_REQUEST['rev2'])){
  14          $rev1 = (int) $_REQUEST['rev2'][0];
  15          $rev2 = (int) $_REQUEST['rev2'][1];
  16
  17 --- dokuwiki-20110329/inc/html.php~     2011-03-29 09:20:42.000000000 +0300
  18 +++ dokuwiki-20110329/inc/html.php      2011-03-29 09:21:51.507042136 +0300
  19 @@ -1030,8 +1030,8 @@
  20
  21          $diffurl = wl($ID, array(
  22                          'do'       => 'diff',
  23 -                        'rev2[0]'  => $l_rev,
  24 -                        'rev2[1]'  => $r_rev,
  25 +                        'r1'       => $l_rev,
  26 +                        'r2'       => $r_rev,
  27                          'difftype' => $type,
  28                        ));
  29          ptln('<br /><a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a>');
  30 --- dokuwiki-rc2010-10-07/inc/common.php~       2010-10-07 21:41:20.000000000 +0300
  31 +++ dokuwiki-rc2010-10-07/inc/common.php        2010-10-07 21:45:00.639114275 +0300
  32 @@ -1147,6 +1147,8 @@
  33      }elseif($rev){
  34          $subject = $lang['mail_changed'].' '.$id;
  35          $text = str_replace('@OLDPAGE@',wl($id,"rev=$rev",true,'&'),$text);
  36 +        $rev2 = $INFO['meta']['date']['modified'];
  37 +        $text = str_replace('@DIFFPAGE@',wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&'),$text);
  38          $df  = new Diff(explode("\n",rawWiki($id,$rev)),
  39                          explode("\n",rawWiki($id)));
  40          $dformat = new UnifiedDiffFormatter();
  41 @@ -1154,6 +1156,7 @@
  42      }else{
  43          $subject=$lang['mail_newpage'].' '.$id;
  44          $text = str_replace('@OLDPAGE@','none',$text);
  45 +        $text = str_replace('@DIFFPAGE@','none',$text);
  46          $diff = rawWiki($id);
  47      }
  48      $text = str_replace('@DIFF@',$diff,$text);