1 adds: @DIFFPAGE@ placeholder to templates
5 http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev2=&difftype=sidebyside
7 --- dokuwiki-2012-07-16/inc/html.php~ 2012-07-16 11:47:58.000000000 +0300
8 +++ dokuwiki-2012-07-16/inc/html.php 2012-07-16 11:53:24.640163788 +0300
10 // given as rev and rev2 parameters, with rev2 being optional. Or in an
14 $rev2 = $INPUT->ref('rev2');
15 - if(is_array($rev2)){
17 + // handle $r1 + $r2, see DW #1821
18 + if ($INPUT->has('r1') && $INPUT->has('r2')) {
19 + $rev1 = $INPUT->int('r1');
20 + $rev2 = $INPUT->int('r2');
21 + } elseif(is_array($rev2)){
22 $rev1 = (int) $rev2[0];
23 $rev2 = (int) $rev2[1];
25 --- dokuwiki-20110329/inc/html.php~ 2011-03-29 09:20:42.000000000 +0300
26 +++ dokuwiki-20110329/inc/html.php 2011-03-29 09:21:51.507042136 +0300
29 $diffurl = wl($ID, array(
31 - 'rev2[0]' => $l_rev,
32 - 'rev2[1]' => $r_rev,
37 ptln('<br /><a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a>');
38 --- dokuwiki/inc/subscription.php 2013-05-29 22:02:46.801329978 +0300
39 +++ dokuwiki/inc/subscription.php 2013-05-29 23:04:29.374883349 +0300
41 * @return bool true if successfully sent
43 public function send_diff($subscriber_mail, $template, $id, $rev = null, $summary = '') {
44 - global $DIFF_INLINESTYLES;
45 + global $DIFF_INLINESTYLES, $INFO;
47 // prepare replacements (keys not set in hrep will be taken from trep)
48 + $rev2 = $INFO['meta']['date']['modified'];
51 - 'NEWPAGE' => wl($id, '', true, '&'),
52 + 'NEWPAGE' => wl($id, "rev=$rev2", true, '&'),
53 'SUMMARY' => $summary,
54 'SUBSCRIBE' => wl($id, array('do' => 'subscribe'), true, '&')
59 $trep['OLDPAGE'] = wl($id, "rev=$rev", true, '&');
60 + $trep['DIFFPAGE']= wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&');
62 $old_content = rawWiki($id, $rev);
63 $new_content = rawWiki($id);
67 $trep['OLDPAGE'] = '---';
68 + $trep['DIFFPAGE']= '---';
69 $tdiff = rawWiki($id);
70 $hdiff = nl2br(hsc($tdiff));