Implemented param tracking for hook users, feels a bit hackish

[lhc/web/wiklou.git] / includes / ImagePage.php

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 176c97d..ad3a5a7 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -10,13 +10,10 @@ class ImagePage extends Article {
        /**
         * @var File
         */
-       /* private */ var $img;
-       /**
-        * @var File
-        */
-       /* private */ var $displayImg;
-       /* private */ var $repo;
-       /* private */ var $fileLoaded;
+       private $img;
+       private $displayImg;
+       private $repo;
+       private $fileLoaded;
 
        var $mExtraDescription = false;
        var $dupes;
@@ -156,7 +153,7 @@ class ImagePage extends Article {
                if ( $showmeta ) {
                        $wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ) . "\n" );
                        $wgOut->addWikiText( $this->makeMetadataTable( $formattedMetadata ) );
-                       $wgOut->addModules( array( 'mediawiki.legacy.metadata' ) );
+                       $wgOut->addModules( array( 'mediawiki.action.view.metadata' ) );
                }
                
                $css = $this->repo->getDescriptionStylesheetUrl();
@@ -268,7 +265,7 @@ class ImagePage extends Article {
         * FIXME: bad interface, see note on MediaHandler::formatMetadata().
         *
         * @param $metadata Array: the array containing the EXIF data
-        * @return String
+        * @return String The metadata table. This is treated as Wikitext (!)
         */
        protected function makeMetadataTable( $metadata ) {
                $r = "<div class=\"mw-imagepage-section-metadata\">";
@@ -1045,20 +1042,24 @@ class ImageHistoryList {
                        # Don't link to unviewable files
                        $row .= '<span class="history-deleted">' . $wgLang->timeAndDate( $timestamp, true ) . '</span>';
                } elseif ( $file->isDeleted( File::DELETED_FILE ) ) {
-                       $this->preventClickjacking();
-                       $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
-                       # Make a link to review the image
-                       $url = $this->skin->link(
-                               $revdel,
-                               $wgLang->timeAndDate( $timestamp, true ),
-                               array(),
-                               array(
-                                       'target' => $this->title->getPrefixedText(),
-                                       'file' => $img,
-                                       'token' => $wgUser->editToken( $img )
-                               ),
-                               array( 'known', 'noclasses' )
-                       );
+                       if ( $local ) {
+                               $this->preventClickjacking();
+                               $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
+                               # Make a link to review the image
+                               $url = $this->skin->link(
+                                       $revdel,
+                                       $wgLang->timeAndDate( $timestamp, true ),
+                                       array(),
+                                       array(
+                                               'target' => $this->title->getPrefixedText(),
+                                               'file' => $img,
+                                               'token' => $wgUser->editToken( $img )
+                                       ),
+                                       array( 'known', 'noclasses' )
+                               );
+                       } else {
+                               $url = $wgLang->timeAndDate( $timestamp, true );
+                       }
                        $row .= '<span class="history-deleted">' . $url . '</span>';
                } else {
                        $url = $iscur ? $this->current->getUrl() : $this->current->getArchiveUrl( $img );
@@ -1079,16 +1080,16 @@ class ImageHistoryList {
 
                // Uploading user
                $row .= '<td>';
-               if ( $local ) {
-                       // Hide deleted usernames
-                       if ( $file->isDeleted( File::DELETED_USER ) ) {
-                               $row .= '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
-                       } else {
+               // Hide deleted usernames
+               if ( $file->isDeleted( File::DELETED_USER ) ) {
+                       $row .= '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
+               } else {
+                       if ( $local ) {
                                $row .= $this->skin->userLink( $user, $usertext ) . ' <span style="white-space: nowrap;">' .
-                                       $this->skin->userToolLinks( $user, $usertext ) . '</span>';
+                               $this->skin->userToolLinks( $user, $usertext ) . '</span>';
+                       } else {
+                               $row .= htmlspecialchars( $usertext );
                        }
-               } else {
-                       $row .= htmlspecialchars( $usertext );
                }
                $row .= '</td><td>';