packages: dokuwiki-plugin-data/dokuwiki-plugin-data.spec, dokuwiki-plugin-d...

[glen]

Author: glen                         Date: Mon Aug 10 16:19:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for removing pages in root namespace

---- Files affected:
packages/dokuwiki-plugin-data:
   dokuwiki-plugin-data.spec (1.7 -> 1.8) , remove-rootns.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec
diff -u packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec:1.7 packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec:1.8
--- packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec:1.7	Fri Aug  7 13:43:48 2009
+++ packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec	Mon Aug 10 18:19:05 2009
@@ -3,13 +3,14 @@
 Summary:	DokuWiki Structured Data Plugin
 Name:		dokuwiki-plugin-%{plugin}
 Version:	20090213
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://dev.splitbrain.org/download/snapshots/data-plugin-latest.tgz
 # Source0-md5:	6a3ee212496a60a343b62246e8002957
 URL:		http://wiki.splitbrain.org/plugin:data
 Patch0:		interwiki.patch
+Patch1:		remove-rootns.patch
 BuildRequires:	rpmbuild(macros) >= 1.520
 Requires:	dokuwiki >= 20090214b-5
 Requires:	php(sqlite)
@@ -32,6 +33,7 @@
 %prep
 %setup -q -n %{plugin}
 %patch0 -p1
+%patch1 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -70,6 +72,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2009/08/10 16:19:05  glen
+- fix for removing pages in root namespace
+
 Revision 1.7  2009/08/07 11:43:48  glen
 - plural patch was bad idea; rel 3
 

================================================================
Index: packages/dokuwiki-plugin-data/remove-rootns.patch
diff -u /dev/null packages/dokuwiki-plugin-data/remove-rootns.patch:1.1
--- /dev/null	Mon Aug 10 18:19:10 2009
+++ packages/dokuwiki-plugin-data/remove-rootns.patch	Mon Aug 10 18:19:05 2009
@@ -0,0 +1,30 @@
+--- data/action.php    2009-02-06 22:40:42.000000000 +0200
++++ tmp/action.php    2009-08-10 19:17:12.000000000 +0300
+@@ -43,10 +43,19 @@
+      */
+     function _handle(&$event, $param){
+         $data = $event->data;
+-        if(strpos($data[0][1],'dataentry') !== false) return; // plugin seems still to be there
++        if (strpos($data[0][1],'dataentry') !== false) {
++            return; // plugin seems still to be there
++        }
+ 
+-        if(!$this->dthlp->_dbconnect()) return;
+-        $id = $data[1].":".$data[2];
++        if (!$this->dthlp->_dbconnect()) {
++            return;
++        }
++        // for root the namespace is empty
++        if (!empty($data[1])) {
++            $id = $data[1].":".$data[2];
++        } else {
++            $id = $data[2];
++        }
+ 
+         // get page id
+         $sql = "SELECT pid FROM pages WHERE page ='".sqlite_escape_string($id)."'";
+@@ -61,4 +70,3 @@
+         sqlite_query($this->dthlp->db, $sql);
+     }
+ }
+-
================================================================

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