From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 22 Jun 2011 11:28:20 +0200 Subject: update to MediaWiki 1.17.0 --- includes/WikiError.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'includes/WikiError.php') diff --git a/includes/WikiError.php b/includes/WikiError.php index 251c1742..452554c3 100644 --- a/includes/WikiError.php +++ b/includes/WikiError.php @@ -1,7 +1,8 @@ + * + * Copyright © 2005 Brion Vibber * http://www.mediawiki.org/ * * This program is free software; you can redistribute it and/or modify @@ -19,6 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * + * @file */ /** @@ -58,7 +60,13 @@ class WikiError { * @return bool */ public static function isError( $object ) { - return $object instanceof WikiError; + if ( $object instanceof WikiError ) { + return true; + } elseif ( $object instanceof Status ) { + return !$object->isOK(); + } else { + return false; + } } } @@ -71,7 +79,7 @@ class WikiErrorMsg extends WikiError { * @param $message String: wiki message name * @param ... parameters to pass to wfMsg() */ - function WikiErrorMsg( $message/*, ... */ ) { + function __construct( $message/*, ... */ ) { $args = func_get_args(); array_shift( $args ); $this->mMessage = wfMsgReal( $message, $args, true ); @@ -100,7 +108,7 @@ class WikiXmlError extends WikiError { * @param $context * @param $offset Int */ - function WikiXmlError( $parser, $message = 'XML parsing error', $context = null, $offset = 0 ) { + function __construct( $parser, $message = 'XML parsing error', $context = null, $offset = 0 ) { $this->mXmlError = xml_get_error_code( $parser ); $this->mColumn = xml_get_current_column_number( $parser ); $this->mLine = xml_get_current_line_number( $parser ); -- cgit v1.2.3-54-g00ecf