include rev for NEWPAGE links

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 150a0484dc91b3d2e52e783a4a5ed2372fc8c53c..059affc1b5da0a3f9f5a37cc6b6bffd1e716d193 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -8,7 +8,7 @@ Summary:        PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       0.13
+Release:       0.14
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz

diff --git a/task-1821.patch b/task-1821.patch
index fadc0dc9f7490acd97f2f560b97932681f513eff..4854d2040f348465aef7853aececd16ad08f9c57 100644 (file)
--- a/task-1821.patch
+++ b/task-1821.patch
@@ -35,9 +35,9 @@ http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev
                          'difftype' => $type,
                        ));
          ptln('<br /><a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a>');
---- dokuwiki-2013-05-10/inc/subscription.php   2013-05-29 18:39:50.554035739 +0300
-+++ dokuwiki/inc/subscription.php      2013-05-29 22:02:46.801329978 +0300
-@@ -384,7 +384,7 @@
+--- dokuwiki/inc/subscription.php      2013-05-29 22:02:46.801329978 +0300
++++ dokuwiki/inc/subscription.php      2013-05-29 23:04:29.374883349 +0300
+@@ -384,12 +384,13 @@
       * @return bool                     true if successfully sent
       */
      public function send_diff($subscriber_mail, $template, $id, $rev = null, $summary = '') {
@@ -45,12 +45,18 @@ http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev
 +        global $DIFF_INLINESTYLES, $INFO;
  
          // prepare replacements (keys not set in hrep will be taken from trep)
++        $rev2 = $INFO['meta']['date']['modified'];
          $trep = array(
-@@ -398,6 +398,8 @@
+             'PAGE' => $id,
+-            'NEWPAGE' => wl($id, '', true, '&'),
++            'NEWPAGE' => wl($id, "rev=$rev2", true, '&'),
+             'SUMMARY' => $summary,
+             'SUBSCRIBE' => wl($id, array('do' => 'subscribe'), true, '&')
+         );
+@@ -398,6 +399,7 @@
          if($rev) {
              $subject = 'changed';
              $trep['OLDPAGE'] = wl($id, "rev=$rev", true, '&');
-+            $rev2            = $INFO['meta']['date']['modified'];
 +            $trep['DIFFPAGE']= wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&');
  
              $old_content = rawWiki($id, $rev);