From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 31 Aug 2015 19:30:44 +0000 (+0000)
Subject: Merge "Don't free the parser in the catch() block of parse()"
X-Git-Tag: 1.31.0-rc.0~10206
X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=0f9a3feeffaff7f4ccf45f2f977a9a17d64c141a;p=lhc%2Fweb%2Fwiklou.git

Merge "Don't free the parser in the catch() block of parse()"
---

0f9a3feeffaff7f4ccf45f2f977a9a17d64c141a
diff --cc includes/media/XMP.php
index 87aff42e2c,5ded976e4f..64a7e8a805
--- a/includes/media/XMP.php
+++ b/includes/media/XMP.php
@@@ -390,19 -378,8 +390,15 @@@ class XMPReader implements LoggerAwareI
  				return false;
  			}
  		} catch ( Exception $e ) {
 -			$this->logger->info( 'XMP parse error: ' . $e );
 +			$this->logger->warning(
 +				'{method} Exception caught while parsing: ' . $e->getMessage(),
 +				array(
 +					'method' => __METHOD__,
 +					'exception' => $e,
 +					'content' => $content,
 +				)
 +			);
  			$this->results = array();
- 
- 			if ( $allOfIt ) {
- 				$this->destroyXMLParser();
- 			}
  			return false;
  		}
  		if ( $allOfIt ) {