From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 extensions/PdfHandler/PdfHandler_body.php | 34 +++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'extensions/PdfHandler/PdfHandler_body.php')

diff --git a/extensions/PdfHandler/PdfHandler_body.php b/extensions/PdfHandler/PdfHandler_body.php
index 2a08a95b..0b192bbb 100644
--- a/extensions/PdfHandler/PdfHandler_body.php
+++ b/extensions/PdfHandler/PdfHandler_body.php
@@ -22,6 +22,12 @@
  */
 
 class PdfHandler extends ImageHandler {
+	static $messages = array(
+		'main' => 'pdf-file-page-warning',
+		'header' => 'pdf-file-page-warning-header',
+		'info' => 'pdf-file-page-warning-info',
+		'footer' => 'pdf-file-page-warning-footer',
+	);
 
 	/**
 	 * @return bool
@@ -325,9 +331,10 @@ class PdfHandler extends ImageHandler {
 
 	/**
 	 * @param $image File
+	 * @param bool|IContextSource $context Context to use (optional)
 	 * @return bool|int
 	 */
-	function formatMetadata( $image ) {
+	function formatMetadata( $image, $context = false ) {
 		$meta = $image->getMetadata();
 
 		if ( !$meta ) {
@@ -345,7 +352,7 @@ class PdfHandler extends ImageHandler {
 		}
 
 		// Inherited from MediaHandler.
-		return $this->formatMetadataHelper( $meta['mergedMetadata'] );
+		return $this->formatMetadataHelper( $meta['mergedMetadata'], $context );
 	}
 
 	/**
@@ -383,4 +390,27 @@ class PdfHandler extends ImageHandler {
 		return $data['text'][$page - 1];
 	}
 
+	/**
+	 * Adds a warning about PDFs being potentially dangerous to the file
+	 * page. Multiple messages with this base will be used.
+	 * @param File $file
+	 * @return array
+	 */
+	function getWarningConfig( $file ) {
+		return array(
+			'messages' => self::$messages,
+			'link' => '//www.mediawiki.org/wiki/Special:MyLanguage/Help:Security/PDF_files',
+			'module' => 'pdfhandler.messages',
+		);
+	}
+
+	/**
+	 * Register a module with the warning messages in it.
+	 * @param &$resourceLoader ResourceLoader
+	 */
+	static function registerWarningModule( &$resourceLoader ) {
+		$resourceLoader->register( 'pdfhandler.messages', array(
+			'messages' => array_values( self::$messages ),
+		) );
+	}
 }
-- 
cgit v1.2.3-54-g00ecf