updated task-1821.patch

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 18c0d4114cb8290262ab7a34e34bc3ae9781419a..150a0484dc91b3d2e52e783a4a5ed2372fc8c53c 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.11
+Release:       0.13
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -147,7 +147,7 @@ touch data/pages/playground/playground.txt
 %patch15 -p1
 %patch19 -p1
 %patch20 -p1
-#%%patch21 -p1 CHECKME
+%patch21 -p1
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1

diff --git a/task-1821.patch b/task-1821.patch
index 08257be1c346e00041b36eef45ef4f9ed15e8192..fadc0dc9f7490acd97f2f560b97932681f513eff 100644 (file)
--- a/task-1821.patch
+++ b/task-1821.patch
@@ -1,3 +1,5 @@
+adds: @DIFFPAGE@ placeholder to templates
+
 TODO:
 use rev1, rev2
 http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev2=&difftype=sidebyside
@@ -33,22 +35,31 @@ http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev
                          'difftype' => $type,
                        ));
          ptln('<br /><a class="wikilink1" href="'.$diffurl.'">'.$lang['difflink'].'</a>');
---- dokuwiki-2012-09-08/inc/common.php~        2012-09-08 17:57:46.000000000 +0300
-+++ dokuwiki-2012-09-08/inc/common.php 2012-09-08 17:58:26.151228475 +0300
-@@ -1179,6 +1179,8 @@
-     } elseif($rev) {
-         $subject         = $lang['mail_changed'].' '.$id;
-         $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);
-         $new_content     = rawWiki($id);
-         $df              = new Diff(explode("\n", $old_content),
-@@ -1191,6 +1193,7 @@
-     } else {
-         $subject         = $lang['mail_newpage'].' '.$id;
-         $trep['OLDPAGE'] = '---';
-+        $trep['DIFFPAGE']= '---';
-         $tdiff           = rawWiki($id);
-         $hdiff           = nl2br(hsc($tdiff));
-     }
+--- 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 @@
+      * @return bool                     true if successfully sent
+      */
+     public function send_diff($subscriber_mail, $template, $id, $rev = null, $summary = '') {
+-        global $DIFF_INLINESTYLES;
++        global $DIFF_INLINESTYLES, $INFO;
+ 
+         // prepare replacements (keys not set in hrep will be taken from trep)
+         $trep = array(
+@@ -398,6 +398,8 @@
+         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);
+             $new_content = rawWiki($id);
+@@ -417,6 +419,7 @@
+         } else {
+             $subject = 'newpage';
+             $trep['OLDPAGE'] = '---';
++            $trep['DIFFPAGE']= '---';
+             $tdiff = rawWiki($id);
+             $hdiff = nl2br(hsc($tdiff));
+         }