packages: dokuwiki/dokuwiki.spec, dokuwiki/plugin_exists-check.patch (NEW) ...

[glen]

Author: glen                         Date: Tue Oct 13 01:20:27 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- silently check if plugin exists; rel 7

---- Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.54 -> 1.55) , plugin_exists-check.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.54 packages/dokuwiki/dokuwiki.spec:1.55
--- packages/dokuwiki/dokuwiki.spec:1.54	Mon Aug 31 13:26:19 2009
+++ packages/dokuwiki/dokuwiki.spec	Tue Oct 13 03:20:22 2009
@@ -5,7 +5,7 @@
 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
@@ -35,6 +35,7 @@
 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
@@ -109,6 +110,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 find -name _dummy | xargs rm
 rm -f lib/index.html lib/plugins/index.html
@@ -320,6 +322,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2009/10/13 01:20:22  glen
+- silently check if plugin exists; rel 7
+
 Revision 1.54  2009/08/31 11:26:19  glen
 - set memory limit and unify cli apps
 

================================================================
Index: packages/dokuwiki/plugin_exists-check.patch
diff -u /dev/null packages/dokuwiki/plugin_exists-check.patch:1.1
--- /dev/null	Tue Oct 13 03:20:27 2009
+++ packages/dokuwiki/plugin_exists-check.patch	Tue Oct 13 03:20:22 2009
@@ -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;
+     }
+ 
================================================================

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