Bump 1.25

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

diff --git a/includes/Status.php b/includes/Status.php
index 0244c8a..1a72968 100644 (file)
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -64,7 +64,7 @@ class Status {
        /**
         * Factory function for fatal errors
         *
-        * @param string|Message $message message name or object
+        * @param string|Message $message Message name or object
         * @return Status
         */
        static function newFatal( $message /*, parameters...*/ ) {
@@ -405,15 +405,20 @@ class Status {
        /**
         * Returns true if the specified message is present as a warning or error
         *
-        * Note, due to the lack of tools for comparing Message objects, this
-        * function will not work when using a Message object as a parameter.
+        * @param string|Message $message Message key or object to search for
         *
-        * @param string $msg Message name
         * @return bool
         */
-       public function hasMessage( $msg ) {
+       public function hasMessage( $message ) {
+               if ( $message instanceof Message ) {
+                       $message = $message->getKey();
+               }
                foreach ( $this->errors as $error ) {
-                       if ( $error['message'] === $msg ) {
+                       if ( $error['message'] instanceof Message
+                               && $error['message']->getKey() === $message
+                       ) {
+                               return true;
+                       } elseif ( $error['message'] === $message ) {
                                return true;
                        }
                }