- silently check if plugin exists; rel 7

Changed files:
    dokuwiki.spec -> 1.55
    plugin_exists-check.patch -> 1.1

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 755484dc8fdabf481d34fe670eca8c6b73a6f16d..f130a59546683b3adac7d51ae238cfb920d6adc2 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:       6
+Release:       7
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -34,6 +34,7 @@ Patch13:      %{name}-media-directlink.patch
 Patch14:       interwiki-outputonly.patch
 Patch15:       simplepie.patch
 Patch16:       cliapps.patch
+Patch17:       plugin_exists-check.patch
 URL:           http://wiki.splitbrain.org/wiki:dokuwiki
 BuildRequires: rpmbuild(macros) >= 1.520
 Requires:      geshi >= 1.0.7.19
@@ -108,6 +109,7 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 find -name _dummy | xargs rm
 rm -f lib/index.html lib/plugins/index.html

diff --git a/plugin_exists-check.patch b/plugin_exists-check.patch
new file mode 100644 (file)
index 0000000..c7899e4
--- /dev/null
+++ b/plugin_exists-check.patch
@@ -0,0 +1,11 @@
+--- dokuwiki-2009-02-14/inc/plugincontroller.class.php~        2009-02-14 14:13:25.000000000 +0200
++++ dokuwiki-2009-02-14/inc/plugincontroller.class.php 2009-10-13 04:18:14.000000000 +0300
+@@ -79,7 +79,7 @@
+     $dir = $this->get_directory($plugin);
+     $file = $component ? "$type/$component.php" : "$type.php";
+ 
+-    if (!include_once(DOKU_PLUGIN."$dir/$file")) {
++    if (!file_exists(DOKU_PLUGIN."$dir/$file") || !include_once(DOKU_PLUGIN."$dir/$file")) {
+       return null;
+     }
+