dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[LockManager] Added support for a default lock manager.
[lhc/web/wiklou.git]
/
includes
/
WikiError.php
diff --git
a/includes/WikiError.php
b/includes/WikiError.php
index
c508200
..
7c167f6
100644
(file)
--- a/
includes/WikiError.php
+++ b/
includes/WikiError.php
@@
-1,7
+1,8
@@
<?php
/**
* MediaWiki error classes
<?php
/**
* MediaWiki error classes
- * Copyright (C) 2005 Brion Vibber <brion@pobox.com>
+ *
+ * Copyright © 2005 Brion Vibber <brion@pobox.com>
* http://www.mediawiki.org/
*
* This program is free software; you can redistribute it and/or modify
* 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
*
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
+ * @file
*/
/**
*/
/**
@@
-29,8
+31,11
@@
class WikiError {
/**
* @param $message string
class WikiError {
/**
* @param $message string
+ *
+ * @deprecated since 1.17
*/
function __construct( $message ) {
*/
function __construct( $message ) {
+ wfDeprecated( __METHOD__, '1.17' );
$this->mMessage = $message;
}
$this->mMessage = $message;
}
@@
-56,9
+61,18
@@
class WikiError {
*
* @param $object mixed
* @return bool
*
* @param $object mixed
* @return bool
+ *
+ * @deprecated since 1.17
*/
public static function isError( $object ) {
*/
public static function isError( $object ) {
- return $object instanceof WikiError;
+ wfDeprecated( __METHOD__, '1.17' );
+ if ( $object instanceof WikiError ) {
+ return true;
+ } elseif ( $object instanceof Status ) {
+ return !$object->isOK();
+ } else {
+ return false;
+ }
}
}
}
}
@@
-70,16
+84,30
@@
class WikiErrorMsg extends WikiError {
/**
* @param $message String: wiki message name
* @param ... parameters to pass to wfMsg()
/**
* @param $message String: wiki message name
* @param ... parameters to pass to wfMsg()
+ *
+ * @deprecated since 1.17
*/
*/
- function WikiErrorMsg( $message/*, ... */ ) {
+ function __construct( $message/*, ... */ ) {
+ wfDeprecated( __METHOD__, '1.17' );
$args = func_get_args();
array_shift( $args );
$this->mMessage = wfMsgReal( $message, $args, true );
$args = func_get_args();
array_shift( $args );
$this->mMessage = wfMsgReal( $message, $args, true );
+ $this->mMsgKey = $message;
+ $this->mMsgArgs = $args;
+ }
+
+ function getMessageKey() {
+ return $this->mMsgKey;
+ }
+
+ function getMessageArgs() {
+ return $this->mMsgArgs;
}
}
/**
}
}
/**
- * @todo document
+ * Error class designed to handle errors involved with
+ * XML parsing
* @ingroup Exception
*/
class WikiXmlError extends WikiError {
* @ingroup Exception
*/
class WikiXmlError extends WikiError {
@@
-88,8
+116,11
@@
class WikiXmlError extends WikiError {
* @param $message string
* @param $context
* @param $offset Int
* @param $message string
* @param $context
* @param $offset Int
+ *
+ * @deprecated since 1.17
*/
*/
- function WikiXmlError( $parser, $message = 'XML parsing error', $context = null, $offset = 0 ) {
+ function __construct( $parser, $message = 'XML parsing error', $context = null, $offset = 0 ) {
+ wfDeprecated( __METHOD__, '1.17' );
$this->mXmlError = xml_get_error_code( $parser );
$this->mColumn = xml_get_current_column_number( $parser );
$this->mLine = xml_get_current_line_number( $parser );
$this->mXmlError = xml_get_error_code( $parser );
$this->mColumn = xml_get_current_column_number( $parser );
$this->mLine = xml_get_current_line_number( $parser );