From 0bd50926ca15eed6997659eacbe5ecac8ed50ebc Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Sat, 16 Apr 2011 11:17:14 +0000
Subject: [PATCH] Remove some unused variables

Fix typo in wfDeprecated usage

Fix some more unreachable code
---
 includes/media/Bitmap.php                | 2 +-
 includes/media/BitmapMetadataHandler.php | 2 +-
 includes/media/GIFMetadataExtractor.php  | 2 --
 includes/media/Generic.php               | 4 +++-
 includes/media/IPTC.php                  | 1 -
 includes/media/JpegMetadataExtractor.php | 5 -----
 includes/media/PNGMetadataExtractor.php  | 6 ------
 7 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index a9ebd3f729..8011a2d7f6 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -682,7 +682,7 @@ class BitmapHandler extends ImageHandler {
 	 * @deprecated
 	 */
 	function getMetadata( $image, $filename ) {
-		wfDeprected( __METHOD__ );
+		wfDeprecated( __METHOD__ );
 		global $wgShowEXIF;
 		if ( $wgShowEXIF && file_exists( $filename ) ) {
 			$exif = new Exif( $filename );
diff --git a/includes/media/BitmapMetadataHandler.php b/includes/media/BitmapMetadataHandler.php
index 80b93232b8..e618762dfa 100644
--- a/includes/media/BitmapMetadataHandler.php
+++ b/includes/media/BitmapMetadataHandler.php
@@ -114,7 +114,7 @@ class BitmapMetadataHandler {
 		$showXMP = function_exists( 'xml_parser_create_ns' );
 		$meta = new self();
 		$meta->getExif( $filename );
-		$seg = Array();
+
 		$seg = JpegMetadataExtractor::segmentSplitter( $filename );
 		if ( isset( $seg['COM'] ) && isset( $seg['COM'][0] ) ) {
 			$meta->addMetadata( Array( 'JPEGFileComment' => $seg['COM'] ), 'native' );
diff --git a/includes/media/GIFMetadataExtractor.php b/includes/media/GIFMetadataExtractor.php
index 71003b721b..86d624b768 100644
--- a/includes/media/GIFMetadataExtractor.php
+++ b/includes/media/GIFMetadataExtractor.php
@@ -114,8 +114,6 @@ class GIFMetadataExtractor {
 					}
 				} elseif ($extension_code == 0xFE) {
 					// Comment block(s).
-					$data = '';
-
 					$data = self::readBlock( $fh );
 					if ( $data === "" ) {
 						throw new Exception( 'Read error, zero-length comment block' );
diff --git a/includes/media/Generic.php b/includes/media/Generic.php
index 0db9ae8d43..c3bd102c7a 100644
--- a/includes/media/Generic.php
+++ b/includes/media/Generic.php
@@ -125,10 +125,12 @@ abstract class MediaHandler {
 	*/
 	function convertMetadataVersion( $metadata, $version = 1 ) {
 		if ( !is_array( $metadata ) ) {
+
 			//unserialize to keep return parameter consistent.
 			wfSuppressWarnings();
-			return unserialize( $metadata );
+			$ret = unserialize( $metadata );
 			wfRestoreWarnings();
+			return $ret;
 		}
 		return $metadata;
 	}
diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php
index 3db845b6e4..896aa36131 100644
--- a/includes/media/IPTC.php
+++ b/includes/media/IPTC.php
@@ -401,7 +401,6 @@ class IPTC {
 	* @param $charset String: The charset
 	*/
 	private static function convIPTC ( $data, $charset ) {
-		global $wgLang;
 		if ( is_array( $data ) ) {
 			foreach ($data as &$val) {
 				$val = self::convIPTCHelper( $val, $charset );
diff --git a/includes/media/JpegMetadataExtractor.php b/includes/media/JpegMetadataExtractor.php
index d4f74f0ee7..d8433fadee 100644
--- a/includes/media/JpegMetadataExtractor.php
+++ b/includes/media/JpegMetadataExtractor.php
@@ -142,11 +142,6 @@ class JpegMetadataExtractor {
 
 		// the +12 is the length of an empty item.
 		while ( $offset + 12 <= $appLen ) {
-			$valid = true;
-			$id = false;
-			$lenName = false;
-			$lenData = false;
-
 			if ( substr( $app13, $offset, 4 ) !== '8BIM' ) {
 				// its supposed to be 8BIM
 				// but apparently sometimes isn't esp. in
diff --git a/includes/media/PNGMetadataExtractor.php b/includes/media/PNGMetadataExtractor.php
index e63a280273..314208edce 100644
--- a/includes/media/PNGMetadataExtractor.php
+++ b/includes/media/PNGMetadataExtractor.php
@@ -53,8 +53,6 @@ class PNGMetadataExtractor {
 			/* Other potentially useful things - Document */
 		);
 
-		$showXMP = function_exists( 'xml_parser_create_ns' );
-
 		$frameCount = 0;
 		$loopCount = 1;
 		$text = array();
@@ -203,8 +201,6 @@ class PNGMetadataExtractor {
 
 			} elseif ( $chunk_type == 'tEXt' ) {
 				$buf = self::read( $fh, $chunk_size );
-				$keyword = '';
-				$content = '';
 
 				list( $keyword, $content ) = explode( "\x00", $buf, 2 );
 				if ( $keyword === '' || $content === '' ) {
@@ -233,8 +229,6 @@ class PNGMetadataExtractor {
 			} elseif ( $chunk_type == 'zTXt' ) {
 				if ( function_exists( 'gzuncompress' ) ) {
 					$buf = self::read( $fh, $chunk_size );
-					$keyword = '';
-					$postKeyword = '';
 
 					list( $keyword, $postKeyword ) = explode( "\x00", $buf, 2 );
 					if ( $keyword === '' || $postKeyword === '' ) {
-- 
2.20.1