[packages/dokuwiki/DEVEL] updated task-1821.patch
glen
glen at pld-linux.org
Wed May 29 22:26:26 CEST 2013
commit b38bd2f0cb186d2e14988f6e1c22b8b09669ce06
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed May 29 22:14:32 2013 +0300
updated task-1821.patch
dokuwiki.spec | 4 ++--
task-1821.patch | 49 ++++++++++++++++++++++++++++++-------------------
2 files changed, 32 insertions(+), 21 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 18c0d41..150a048 100644
--- 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 08257be..fadc0dc 100644
--- 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));
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/51769953dc6c6747d72c414383db14ba61391653
More information about the pld-cvs-commit
mailing list