task-1821.patch

   1 TODO:
   2 use rev1, rev2
   3 http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev2=&difftype=sidebyside
   4
   5 --- dokuwiki-2012-07-16/inc/html.php~   2012-07-16 11:47:58.000000000 +0300
   6 +++ dokuwiki-2012-07-16/inc/html.php    2012-07-16 11:53:24.640163788 +0300
   7 @@ -1086,9 +1086,13 @@
   8      // given as rev and rev2 parameters, with rev2 being optional. Or in an
   9      // array in rev2.
  10      $rev1 = $REV;
  11 -
  12      $rev2 = $INPUT->ref('rev2');
  13 -    if(is_array($rev2)){
  14 +
  15 +    // handle $r1 + $r2, see DW #1821
  16 +    if ($INPUT->has('r1') && $INPUT->has('r2')) {
  17 +        $rev1 = $INPUT->int('r1');
  18 +        $rev2 = $INPUT->int('r2');
  19 +    } elseif(is_array($rev2)){
  20          $rev1 = (int) $rev2[0];
  21          $rev2 = (int) $rev2[1];
  22
  23 --- dokuwiki-20110329/inc/html.php~     2011-03-29 09:20:42.000000000 +0300
  24 +++ dokuwiki-20110329/inc/html.php      2011-03-29 09:21:51.507042136 +0300
  25 @@ -1030,8 +1030,8 @@
  26
  27          $diffurl = wl($ID, array(
  28                          'do'       => 'diff',
  29 -                        'rev2[0]'  => $l_rev,
  30 -                        'rev2[1]'  => $r_rev,
  31 +                        'r1'       => $l_rev,
  32 +                        'r2'       => $r_rev,
  33                          'difftype' => $type,
  34                        ));
  35          ptln('<br /><a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a>');
  36 --- dokuwiki-2012-09-08/inc/common.php~ 2012-09-08 17:57:46.000000000 +0300
  37 +++ dokuwiki-2012-09-08/inc/common.php  2012-09-08 17:58:26.151228475 +0300
  38 @@ -1179,6 +1179,8 @@
  39      } elseif($rev) {
  40          $subject         = $lang['mail_changed'].' '.$id;
  41          $trep['OLDPAGE'] = wl($id, "rev=$rev", true, '&');
  42 +        $rev2            = $INFO['meta']['date']['modified'];
  43 +        $trep['DIFFPAGE']= wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&');
  44          $old_content     = rawWiki($id, $rev);
  45          $new_content     = rawWiki($id);
  46          $df              = new Diff(explode("\n", $old_content),
  47 @@ -1191,6 +1193,7 @@
  48      } else {
  49          $subject         = $lang['mail_newpage'].' '.$id;
  50          $trep['OLDPAGE'] = '---';
  51 +        $trep['DIFFPAGE']= '---';
  52          $tdiff           = rawWiki($id);
  53          $hdiff           = nl2br(hsc($tdiff));
  54      }