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
4 // given as rev and rev2 parameters, with rev2 being optional. Or in an
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'];
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];
17 --- dokuwiki/inc/html.php~ 2010-10-07 21:48:30.000000000 +0300
18 +++ dokuwiki/inc/html.php 2010-10-18 17:28:03.106448956 +0300
20 if($intro) print p_locale_xhtml('diff');
23 - $diffurl = wl($ID, array('do'=>'diff', 'rev2[0]'=>$l_rev, 'rev2[1]'=>$r_rev));
24 + $diffurl = wl($ID, array('do'=>'diff', 'r1'=>$l_rev, 'r2'=>$r_rev));
25 ptln('<p class="difflink">');
26 ptln(' <a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a>');
28 --- dokuwiki-rc2010-10-07/inc/common.php~ 2010-10-07 21:41:20.000000000 +0300
29 +++ dokuwiki-rc2010-10-07/inc/common.php 2010-10-07 21:45:00.639114275 +0300
32 $subject = $lang['mail_changed'].' '.$id;
33 $text = str_replace('@OLDPAGE@',wl($id,"rev=$rev",true,'&'),$text);
34 + $rev2 = $INFO['meta']['date']['modified'];
35 + $text = str_replace('@DIFFPAGE@',wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&'),$text);
36 $df = new Diff(explode("\n",rawWiki($id,$rev)),
37 explode("\n",rawWiki($id)));
38 $dformat = new UnifiedDiffFormatter();
41 $subject=$lang['mail_newpage'].' '.$id;
42 $text = str_replace('@OLDPAGE@','none',$text);
43 + $text = str_replace('@DIFFPAGE@','none',$text);
46 $text = str_replace('@DIFF@',$diff,$text);