Merge "Revert "Add AvailableRightsTest for User::getAllRights completeness""

[lhc/web/wiklou.git] / includes / media / XMP.php

diff --git a/includes/media/XMP.php b/includes/media/XMP.php
index cdbd5ab..0d341aa 100644 (file)
--- a/includes/media/XMP.php
+++ b/includes/media/XMP.php
@@ -173,7 +173,7 @@ class XMPReader {
 
                $data = $this->results;
 
-               wfRunHooks( 'XMPGetResults', array( &$data ) );
+               Hooks::run( 'XMPGetResults', array( &$data ) );
 
                if ( isset( $data['xmp-special']['AuthorsPosition'] )
                        && is_string( $data['xmp-special']['AuthorsPosition'] )
@@ -316,7 +316,7 @@ class XMPReader {
                                $this->results = array(); // blank if error.
                                return false;
                        }
-               } catch ( MWException $e ) {
+               } catch ( Exception $e ) {
                        wfDebugLog( 'XMP', 'XMP parse error: ' . $e );
                        $this->results = array();