* (bug 10265) Fix regression in category image gallery paging

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a3621ae..0ef63df 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -165,6 +165,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 10223) Fix edit link in noarticletext localizations for fr, oc
 * (bug 10247) Fix IP address regex to avoid false positive IPv6 matches
 * (bug 9948) Workaround for diff regression with old Mozilla versions
+* (bug 10265) Fix regression in category image gallery paging
 
 
 == API changes since 1.10 ==

diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index 6045ad6..19f1b57 100644 (file)
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -147,6 +147,10 @@ class ImageGallery
        * @param $html  String:  Additional HTML text to be shown. The name and size of the image are always shown.
        */
        function insert( $title, $html='' ) {
+               if ( $title instanceof File ) {
+                       // Old calling convention
+                       $title = $title->getTitle();
+               }
                array_unshift( $this->mImages, array( &$title, $html ) );
        }