packages: dokuwiki/dokuwiki.spec, dokuwiki/interwiki-outputonly.patch (NEW)...

[glen]

Author: glen                         Date: Tue Jul 28 13:55:11 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add interwiki-outputonly.patch; rel 5

---- Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.51 -> 1.52) , interwiki-outputonly.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.51 packages/dokuwiki/dokuwiki.spec:1.52
--- packages/dokuwiki/dokuwiki.spec:1.51	Tue Jun 16 14:52:34 2009
+++ packages/dokuwiki/dokuwiki.spec	Tue Jul 28 15:55:05 2009
@@ -5,7 +5,7 @@
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
 Name:		dokuwiki
 Version:	%{ver}
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -32,6 +32,7 @@
 Patch11:	%{name}-notifyns.patch
 Patch12:	%{name}-mailthreads.patch
 Patch13:	%{name}-media-directlink.patch
+Patch14:	interwiki-outputonly.patch
 URL:		http://wiki.splitbrain.org/wiki:dokuwiki
 BuildRequires:	rpmbuild(macros) >= 1.520
 Requires:	geshi >= 1.0.7.19
@@ -102,6 +103,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 find -name _dummy | xargs rm
 rm -f lib/index.html lib/plugins/index.html
@@ -310,6 +312,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2009/07/28 13:55:05  glen
+- add interwiki-outputonly.patch; rel 5
+
 Revision 1.51  2009/06/16 12:52:34  glen
 - make inc/lang/en/edit.txt as %config; rel 4
 

================================================================
Index: packages/dokuwiki/interwiki-outputonly.patch
diff -u /dev/null packages/dokuwiki/interwiki-outputonly.patch:1.1
--- /dev/null	Tue Jul 28 15:55:11 2009
+++ packages/dokuwiki/interwiki-outputonly.patch	Tue Jul 28 15:55:05 2009
@@ -0,0 +1,24 @@
+--- dokuwiki-2009-02-14/inc/parser/xhtml.php	2009-07-28 16:51:06.599541994 +0300
++++ dokuwiki/inc/parser/xhtml.php	2009-07-28 16:53:48.144936039 +0300
+@@ -569,7 +569,7 @@
+ 
+     /**
+     */
+-    function interwikilink($match, $name = NULL, $wikiName, $wikiUri) {
++    function interwikilink($match, $name = NULL, $wikiName, $wikiUri, $returnonly = false) {
+         global $conf;
+ 
+         $link = array();
+@@ -598,7 +598,11 @@
+         $link['title'] = htmlspecialchars($link['url']);
+ 
+         //output formatted
+-        $this->doc .= $this->_formatLink($link);
++        if($returnonly){
++            return $this->_formatLink($link);
++        }else{
++            $this->doc .= $this->_formatLink($link);
++        }
+     }
+ 
+     /**
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.51&r2=1.52&f=u