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