Merge "Pass context to FormatMetadata class on ImagePage"

diff --combined includes/filerepo/file/File.php
index 4fd332b,eec8d21..6edd6fc
--- 1/includes/filerepo/file/File.php
--- 2/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@@ -47,7 -47,7 +47,7 @@@
   *
   * @ingroup FileAbstraction
   */
 -abstract class File {
 +abstract class File implements IDBAccessObject {
        // Bitfield values akin to the Revision deletion constants
        const DELETED_FILE = 1;
        const DELETED_COMMENT = 2;
@@@ -836,18 -836,6 +836,18 @@@
                return false;
        }
  
 +      /**
 +       * Load any lazy-loaded file object fields from source
 +       *
 +       * This is only useful when setting $flags
 +       *
 +       * Overridden by LocalFile to actually query the DB
 +       *
 +       * @param integer $flags Bitfield of File::READ_* constants
 +       */
 +      public function load( $flags = 0 ) {
 +      }
 +
        /**
         * Returns true if file exists in the repository.
         *
@@@ -1777,14 -1765,15 +1777,15 @@@
        }
  
        /**
+        * @param bool|IContextSource $context Context to use (optional)
         * @return bool
         */
-       function formatMetadata() {
+       function formatMetadata( $context = false ) {
                if ( !$this->getHandler() ) {
                        return false;
                }
  
-               return $this->getHandler()->formatMetadata( $this, $this->getMetadata() );
+               return $this->getHandler()->formatMetadata( $this, $context );
        }
  
        /**
@@@ -2020,7 -2009,7 +2021,7 @@@
                                wfDebug( "miss\n" );
                        }
                        wfDebug( "Fetching shared description from $renderUrl\n" );
 -                      $res = Http::get( $renderUrl );
 +                      $res = Http::get( $renderUrl, array(), __METHOD__ );
                        if ( $res && $this->repo->descriptionCacheExpiry > 0 ) {
                                $wgMemc->set( $key, $res, $this->repo->descriptionCacheExpiry );
                        }
@@@ -2058,17 -2047,6 +2059,17 @@@
                return $this->repo->getFileTimestamp( $this->getPath() );
        }
  
 +      /**
 +       * Returns the timestamp (in TS_MW format) of the last change of the description page.
 +       * Returns false if the file does not have a description page, or retrieving the timestamp
 +       * would be expensive.
 +       * @since 1.25
 +       * @return string|bool
 +       */
 +      public function getDescriptionTouched() {
 +              return false;
 +      }
 +
        /**
         * Get the SHA-1 base 36 hash of the file
         *

diff --combined includes/page/ImagePage.php
index 855f233,803e425..504fa74
--- 1/includes/page/ImagePage.php
--- 2/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@@ -140,7 -140,7 +140,7 @@@ class ImagePage extends Article 
  
                if ( $wgShowEXIF && $this->displayImg->exists() ) {
                        // @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata().
-                       $formattedMetadata = $this->displayImg->formatMetadata();
+                       $formattedMetadata = $this->displayImg->formatMetadata( $this->getContext() );
                        $showmeta = $formattedMetadata !== false;
                } else {
                        $showmeta = false;
@@@ -1365,6 -1365,7 +1365,6 @@@ class ImageHistoryList extends ContextS
                } else {
                        if ( $local ) {
                                $row .= Linker::userLink( $userId, $userText );
 -                              $row .= $this->msg( 'word-separator' )->escaped();
                                $row .= '<span style="white-space: nowrap;">';
                                $row .= Linker::userToolLinks( $userId, $userText );
                                $row .= '</span>';