From 64e572519fecaf495c5461e66521cf084eea8d45 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 26 Jan 2007 12:10:06 +0000
Subject: [PATCH] * Fix multipage selector drop-down for DjVu images to work
 when title   is passed as a query string parameter; we have to pass the title
 as   a form parameter or it gets dropped from the form submission URL

---
 RELEASE-NOTES          | 3 +++
 includes/ImagePage.php | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7166b7ba7c..120f9c5ce2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -151,6 +151,9 @@ lighter making things easier to read.
 * (bug 8780) Clarify message for command-line scripts if LocalSettings.php exists but is not readable
 * (bug 8777) Suppress 'previous' link on Special:Allpages when at first page
 * (bug 8774) Fix path for GNU FDL rights icon on new installs
+* Fix multipage selector drop-down for DjVu images to work when title
+  is passed as a query string parameter; we have to pass the title as
+  a form parameter or it gets dropped from the form submission URL
 
 
 == Languages updated ==
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 2e6e94e4d3..fda8f132bf 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -268,7 +268,11 @@ class ImagePage extends Article {
 						$thumb2 = '';
 					}
 
-					$select = '<form name="pageselector" action="' . $this->img->getEscapeLocalUrl( '' ) . '" method="GET" onchange="document.pageselector.submit();">' ;
+					global $wgScript;
+					$select = '<form name="pageselector" action="' . 
+						htmlspecialchars( $wgScript ) .
+						'" method="get" onchange="document.pageselector.submit();">' .
+						Xml::hidden( 'title', $this->getTitle()->getPrefixedDbKey() );
 					$select .= $wgOut->parse( wfMsg( 'imgmultigotopre' ), false ) .
 						' <select id="pageselector" name="page">';
 					for ( $i=1; $i <= $count; $i++ ) {
-- 
2.20.1