r52070 breaks the use of optgroups etc: array(...) is cast to 'Array'. Need to only...

[lhc/web/wiklou.git] / includes / WikiError.php

diff --git a/includes/WikiError.php b/includes/WikiError.php
index adda36b..6c7406a 100644 (file)
--- a/includes/WikiError.php
+++ b/includes/WikiError.php
@@ -33,6 +33,7 @@ class WikiError {
         * @param $message string
         */
        function __construct( $message ) {
+               wfDeprecated( __METHOD__ );
                $this->mMessage = $message;
        }
 
@@ -60,7 +61,14 @@ class WikiError {
         * @return bool
         */
        public static function isError( $object ) {
-               return $object instanceof WikiError;
+               wfDeprecated( __METHOD__ );
+               if ( $object instanceof WikiError ) {
+                       return true;
+               } elseif ( $object instanceof Status ) {
+                       return !$object->isOK();
+               } else {
+                       return false;
+               }
        }
 }
 
@@ -74,6 +82,7 @@ class WikiErrorMsg extends WikiError {
         * @param ... parameters to pass to wfMsg()
         */
        function __construct( $message/*, ... */ ) {
+               wfDeprecated( __METHOD__ );
                $args = func_get_args();
                array_shift( $args );
                $this->mMessage = wfMsgReal( $message, $args, true );
@@ -103,6 +112,7 @@ class WikiXmlError extends WikiError {
         * @param $offset Int
         */
        function __construct( $parser, $message = 'XML parsing error', $context = null, $offset = 0 ) {
+               wfDeprecated( __METHOD__ );
                $this->mXmlError = xml_get_error_code( $parser );
                $this->mColumn = xml_get_current_column_number( $parser );
                $this->mLine = xml_get_current_line_number( $parser );