* 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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7166b7b..120f9c5 100644 (file)
--- 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 2e6e94e..fda8f13 100644 (file)
--- 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++ ) {