From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 3 May 2012 13:01:35 +0200
Subject: Update to MediaWiki 1.19.0

---
 includes/api/ApiQueryImageInfo.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'includes/api/ApiQueryImageInfo.php')

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index ab179b9f..03a24821 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -24,11 +24,6 @@
  * @file
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-	// Eclipse helper - will be ignored in production
-	require_once( 'ApiQueryBase.php' );
-}
-
 /**
  * A query action to get image information and upload history.
  *
@@ -318,8 +313,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
 				$vals['commenthidden'] = '';
 			} else {
 				if ( $pcomment ) {
-					global $wgUser;
-					$vals['parsedcomment'] = $wgUser->getSkin()->formatComment(
+					$vals['parsedcomment'] = Linker::formatComment(
 						$file->getDescription(), $file->getTitle() );
 				}
 				if ( $comment ) {
@@ -568,7 +562,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
 		) );
 	}
 
-	protected function getExamples() {
+	public function getExamples() {
 		return array(
 			'api.php?action=query&titles=File:Albert%20Einstein%20Head.jpg&prop=imageinfo',
 			'api.php?action=query&titles=File:Test.jpg&prop=imageinfo&iilimit=50&iiend=20071231235959&iiprop=timestamp|user|url',
-- 
cgit v1.2.3-54-g00ecf