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

[glen]

Author: glen                         Date: Mon Jun  4 12:34:09 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- preserve #section anchors on redirect

---- Files affected:
packages/dokuwiki-plugin-pageredirect:
   dokuwiki-plugin-pageredirect.spec (1.7 -> 1.8) , preserve-section.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec
diff -u packages/dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec:1.7 packages/dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec:1.8
--- packages/dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec:1.7	Tue Aug 24 16:32:58 2010
+++ packages/dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec	Mon Jun  4 14:34:04 2012
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Wtyczka Page Redirect (przekierowywania stron) dla DokuWiki
 Name:		dokuwiki-plugin-%{plugin}
 Version:	2
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://wiki.zyberdog.dk/_media/php/dw/pageredirect/pageredirect_current.zip
@@ -12,6 +12,7 @@
 Source1:	dokuwiki-find-lang.sh
 Patch0:		%{name}-pagematch.patch
 Patch1:		mute-warning.patch
+Patch2:		preserve-section.patch
 URL:		http://www.dokuwiki.org/plugin:page_redirector
 BuildRequires:	unzip
 Requires:	dokuwiki >= 20061106
@@ -34,6 +35,7 @@
 %setup -q -n %{plugin}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -66,6 +68,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2012/06/04 12:34:04  glen
+- preserve #section anchors on redirect
+
 Revision 1.7  2010/08/24 14:32:58  glen
 - mute one php warning; rel 2
 

================================================================
Index: packages/dokuwiki-plugin-pageredirect/preserve-section.patch
diff -u /dev/null packages/dokuwiki-plugin-pageredirect/preserve-section.patch:1.1
--- /dev/null	Mon Jun  4 14:34:09 2012
+++ packages/dokuwiki-plugin-pageredirect/preserve-section.patch	Mon Jun  4 14:34:04 2012
@@ -0,0 +1,22 @@
+--- pageredirect/action.php	2012-06-04 15:32:26.364418325 +0300
++++ pageredirect/action.php	2012-06-04 15:32:49.548728621 +0300
+@@ -63,9 +63,17 @@
+ 				session_start();
+ 				$_SESSION[DOKU_COOKIE]['redirect'] = $ID;
+ 			}
+-	
++
++			// preserve #section from $page
++			list($page, $section) = explode('#', $page, 2);
++			if (isset($section)) {
++				$section = '#' . $section;
++			} else {
++				$section = '';
++			}
++
+ 			// redirect
+-			header("Location: ".wl($page, Array('redirect' => $redirect), TRUE, '&')); 
++			header("Location: ".wl($page, Array('redirect' => $redirect), TRUE, '&'). $section);
+ 			exit(); 
+ 		} 
+ 	}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec?r1=1.7&r2=1.8