- add interwiki-outputonly.patch; rel 5

Changed files:
    dokuwiki.spec -> 1.52
    interwiki-outputonly.patch -> 1.1

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 592ef387aeb4e8bcdcde504747bf5fd606b9116e..0b5616188193d78c48eb504164e19447d4016a98 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -4,7 +4,7 @@ Summary:        PHP-based Wiki webapplication
 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
@@ -31,6 +31,7 @@ Patch10:      %{name}-mailtext.patch
 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
@@ -101,6 +102,7 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 find -name _dummy | xargs rm
 rm -f lib/index.html lib/plugins/index.html

diff --git a/interwiki-outputonly.patch b/interwiki-outputonly.patch
new file mode 100644 (file)
index 0000000..90bc40b
--- /dev/null
+++ b/interwiki-outputonly.patch
@@ -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);
++        }
+     }
+ 
+     /**