X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FWikiError.php;h=7c167f611be4925139cb2a5a205ee8f947c293e6;hb=b3197063523e629589112d3ccd7871b8591ff9aa;hp=38dbafb66d04d9f03f480d31a0cbeb27e8286eb7;hpb=a26d5a49d755ff4b8039b11d1f26abb5d7bc7e8c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WikiError.php b/includes/WikiError.php
index 38dbafb66d..7c167f611b 100644
--- a/includes/WikiError.php
+++ b/includes/WikiError.php
@@ -1,7 +1,8 @@
 <?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
@@ -16,22 +17,25 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @package MediaWiki
+ * @file
  */
 
 /**
  * Since PHP4 doesn't have exceptions, here's some error objects
  * loosely modeled on the standard PEAR_Error model...
- * @package MediaWiki
+ * @ingroup Exception
  */
 class WikiError {
 	/**
-	 * @param string $message
+	 * @param $message string
+	 *
+	 * @deprecated since 1.17
 	 */
-	function WikiError( $message ) {
+	function __construct( $message ) {
+		wfDeprecated( __METHOD__, '1.17' );
 		$this->mMessage = $message;
 	}
 
@@ -55,41 +59,68 @@ class WikiError {
 	 * Returns true if the given object is a WikiError-descended
 	 * error object, false otherwise.
 	 *
-	 * @param mixed $object
+	 * @param $object mixed
 	 * @return bool
-	 * @static
+	 *
+	 * @deprecated since 1.17
 	 */
-	function isError( &$object ) {
-		return is_a( $object, 'WikiError' );
+	public static function isError( $object ) {
+		wfDeprecated( __METHOD__, '1.17' );
+		if ( $object instanceof WikiError ) {
+			return true;
+		} elseif ( $object instanceof Status ) {
+			return !$object->isOK();
+		} else {
+			return false;
+		}
 	}
 }
 
 /**
  * Localized error message object
- * @package MediaWiki
+ * @ingroup Exception
  */
 class WikiErrorMsg extends WikiError {
 	/**
-	 * @param string $message Wiki message name
+	 * @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 );
+		$this->mMsgKey = $message;
+		$this->mMsgArgs = $args;
+	}
+	
+	function getMessageKey() {
+		return $this->mMsgKey;
+	}
+	
+	function getMessageArgs() {
+		return $this->mMsgArgs;
 	}
 }
 
 /**
- * @package MediaWiki
- * @todo document
+ * Error class designed to handle errors involved with 
+ * XML parsing
+ * @ingroup Exception
  */
 class WikiXmlError extends WikiError {
 	/**
-	 * @param resource $parser
-	 * @param string $message
+	 * @param $parser resource
+	 * @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 );
@@ -102,12 +133,12 @@ class WikiXmlError extends WikiError {
 
 	/** @return string */
 	function getMessage() {
-		return sprintf( '%s at line %d, col %d (byte %d%s): %s',
+		// '$1 at line $2, col $3 (byte $4): $5',
+		return wfMsgHtml( 'xml-error-string',
 			$this->mMessage,
 			$this->mLine,
 			$this->mColumn,
-			$this->mByte,
-			$this->mContext,
+			$this->mByte . $this->mContext,
 			xml_error_string( $this->mXmlError ) );
 	}
 
@@ -121,5 +152,3 @@ class WikiXmlError extends WikiError {
 		}
 	}
 }
-
-?>