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

diff --cc includes/media/XMP.php
index 87aff42,5ded976..64a7e8a
--- 1/includes/media/XMP.php
--- 2/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 ) {