packages: dokuwiki/dokuwiki.spec, dokuwiki/task-1821.patch (NEW) - add $r1, ...

[glen]

Author: glen                         Date: Mon Jan 11 12:37:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add $r1, $r2 GET params support in diff action

---- Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.68 -> 1.69) , task-1821.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.68 packages/dokuwiki/dokuwiki.spec:1.69
--- packages/dokuwiki/dokuwiki.spec:1.68	Mon Jan  4 19:19:56 2010
+++ packages/dokuwiki/dokuwiki.spec	Mon Jan 11 13:37:10 2010
@@ -42,6 +42,7 @@
 Patch18:	install.patch
 Patch19:	pld-branding.patch
 Patch20:	fixprivilegeescalationbug.diff
+Patch21:	task-1821.patch
 URL:		http://www.dokuwiki.org/dokuwiki
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.520
@@ -130,6 +131,7 @@
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %patch66 -p1
 
@@ -354,6 +356,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2010/01/11 12:37:10  glen
+- add $r1, $r2 GET params support in diff action
+
 Revision 1.68  2010/01/04 18:19:56  glen
 - up to 2009-12-25 release
 

================================================================
Index: packages/dokuwiki/task-1821.patch
diff -u /dev/null packages/dokuwiki/task-1821.patch:1.1
--- /dev/null	Mon Jan 11 13:37:16 2010
+++ packages/dokuwiki/task-1821.patch	Mon Jan 11 13:37:10 2010
@@ -0,0 +1,16 @@
+--- dokuwiki/inc/html.php~	2010-01-11 14:35:04.000000000 +0200
++++ dokuwiki/inc/html.php	2010-01-11 14:35:07.213389784 +0200
+@@ -862,8 +862,12 @@
+     // given as rev and rev2 parameters, with rev2 being optional. Or in an
+     // array in rev2.
+     $rev1 = $REV;
++	// handle $r1 + $r2, see DW #1821
++	if (isset($_REQUEST['r1']) && isset($_REQUEST['r2'])) {
++        $rev1 = (int) $_REQUEST['r1'];
++        $rev2 = (int) $_REQUEST['r2'];
+ 
+-    if(is_array($_REQUEST['rev2'])){
++	} else if(is_array($_REQUEST['rev2'])){
+         $rev1 = (int) $_REQUEST['rev2'][0];
+         $rev2 = (int) $_REQUEST['rev2'][1];
+ 
================================================================

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