]>
Commit | Line | Data |
---|---|---|
638afb06 ER |
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 | ||
fac1b343 ER |
17 | --- dokuwiki/inc/common.php 2010-01-11 14:48:58.213308444 +0200 |
18 | +++ dokuwiki/inc/common.php 2010-01-12 12:18:39.000000000 +0200 | |
3e8efaad ER |
19 | @@ -1128,6 +1128,8 @@ |
20 | }elseif($rev){ | |
21 | $subject = $lang['mail_changed'].' '.$id; | |
22 | $text = str_replace('@OLDPAGE@',wl($id,"rev=$rev",true,'&'),$text); | |
23 | + $rev2 = $INFO['meta']['date']['modified']; | |
24 | + $text = str_replace('@DIFFPAGE@',wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&'),$text); | |
25 | require_once(DOKU_INC.'inc/DifferenceEngine.php'); | |
26 | $df = new Diff(explode("\n",rawWiki($id,$rev)), | |
27 | explode("\n",rawWiki($id))); | |
fac1b343 ER |
28 | @@ -1136,6 +1138,7 @@ |
29 | }else{ | |
30 | $subject=$lang['mail_newpage'].' '.$id; | |
31 | $text = str_replace('@OLDPAGE@','none',$text); | |
32 | + $text = str_replace('@DIFFPAGE@','none',$text); | |
33 | $diff = rawWiki($id); | |
34 | } | |
35 | $text = str_replace('@DIFF@',$diff,$text); |