From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 11 Jan 2010 12:37:10 +0000 (+0000)
Subject: - add $r1, $r2 GET params support in diff action
X-Git-Tag: auto/th/dokuwiki-20091225-1~7
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdokuwiki.git;a=commitdiff_plain;h=638afb06afa19a686f89b76952184fe4123b7e70;ds=sidebyside

- add $r1, $r2 GET params support in diff action

Changed files:
    dokuwiki.spec -> 1.69
    task-1821.patch -> 1.1
---

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 4c2bbe5..83d5dfa 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -41,6 +41,7 @@ Patch15:	simplepie.patch
 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
@@ -129,6 +130,7 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %patch66 -p1
 
diff --git a/task-1821.patch b/task-1821.patch
new file mode 100644
index 0000000..f7f13e0
--- /dev/null
+++ b/task-1821.patch
@@ -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];
+