diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
tree | f1fdd326034e05177596851be6a7127615d81498 /includes/FileDeleteForm.php | |
parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/FileDeleteForm.php')
-rw-r--r-- | includes/FileDeleteForm.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index b4e24581..c1d14db0 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -201,7 +201,7 @@ class FileDeleteForm { $dbw->rollback( __METHOD__ ); } } - } catch ( MWException $e ) { + } catch ( Exception $e ) { // Rollback before returning to prevent UI from displaying // incorrect "View or restore N deleted edits?" $dbw->rollback( __METHOD__ ); @@ -210,7 +210,7 @@ class FileDeleteForm { } if ( $status->isOK() ) { - wfRunHooks( 'FileDeleteComplete', array( &$file, &$oldimage, &$page, &$user, &$reason ) ); + Hooks::run( 'FileDeleteComplete', array( &$file, &$oldimage, &$page, &$user, &$reason ) ); } return $status; |