From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 includes/FileDeleteForm.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'includes/FileDeleteForm.php')

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;
-- 
cgit v1.2.3-54-g00ecf