(bug 14771) Thumbnail links to individual DjVu pages have two "page" parameters

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 170eefe..61c5f59 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -263,6 +263,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17778) MediaWiki:Catseparator can now have HTML entities
 * (bug 17676) Error on Special:ListFiles when using Postgres
 * Special:Export doesn't use raw SQL queries anymore
+* (bug 14771) Thumbnail links to individual DjVu pages have two no longer have
+  two "page" parameters
 
 
 == API changes in 1.15 ==

diff --git a/includes/Linker.php b/includes/Linker.php
index c9d4db1..b739244 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -882,10 +882,13 @@ class Linker {
                        }
                }
 
-               if( $page ) {
-                       $query = $query ? '&page=' . urlencode( $page ) : 'page=' . urlencode( $page );
-               }
+               # ThumbnailImage::toHtml() already adds page= onto the end of DjVu URLs
+               # So we don't need to pass it here in $query. However, the URL for the
+               # zoom icon still needs it, so we make a unique query for it. See bug 14771
                $url = $title->getLocalURL( $query );
+               if( $page ) { 
+                       $url = wfAppendQuery( $url, 'page=' . urlencode( $page ) );
+               }
 
                $more = htmlspecialchars( wfMsg( 'thumbnail-more' ) );