1 adds: @DIFFPAGE@ placeholder to templates
5 http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev2=&difftype=sidebyside
7 --- dokuwiki-2014-05-06/inc/html.php 2014-05-08 11:27:02.548232655 +0300
8 +++ dokuwiki-2014-05-06/inc/html.php 2014-05-08 11:27:02.548232655 +0300
12 $rev2 = $INPUT->ref('rev2');
13 - if(is_array($rev2)) {
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');
20 + } elseif(is_array($rev2)){
21 $rev1 = (int) $rev2[0];
22 $rev2 = (int) $rev2[1];
32 'difftype' => $difftype,
35 --- dokuwiki/inc/subscription.php 2013-05-29 22:02:46.801329978 +0300
36 +++ dokuwiki/inc/subscription.php 2013-05-29 23:04:29.374883349 +0300
38 * @return bool true if successfully sent
40 public function send_diff($subscriber_mail, $template, $id, $rev = null, $summary = '') {
41 - global $DIFF_INLINESTYLES;
42 + global $DIFF_INLINESTYLES, $INFO;
44 // prepare replacements (keys not set in hrep will be taken from trep)
45 + $rev2 = $INFO['meta']['date']['modified'];
48 - 'NEWPAGE' => wl($id, '', true, '&'),
49 + 'NEWPAGE' => wl($id, "rev=$rev2", true, '&'),
50 'SUMMARY' => $summary,
51 'SUBSCRIBE' => wl($id, array('do' => 'subscribe'), true, '&')
56 $trep['OLDPAGE'] = wl($id, "rev=$rev", true, '&');
57 + $trep['DIFFPAGE']= wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&');
59 $old_content = rawWiki($id, $rev);
60 $new_content = rawWiki($id);
64 $trep['OLDPAGE'] = '---';
65 + $trep['DIFFPAGE']= '---';
66 $tdiff = rawWiki($id);
67 $hdiff = nl2br(hsc($tdiff));