Clear user cache before checking userrights conflict

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

diff --git a/includes/Message.php b/includes/Message.php
index 57c6264..dd22844 100644 (file)
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -817,10 +817,12 @@ class Message {
                        } elseif ( isset( $param['bitrate'] ) ) {
                                return array( 'before', $this->language->formatBitrate( $param['bitrate'] ) );
                        } else {
-                               trigger_error(
-                                       "Invalid message parameter: " . htmlspecialchars( serialize( $param ) ),
-                                       E_USER_WARNING
-                               );
+                               $warning = 'Invalid parameter for message "' . $this->getKey() . '": ' .
+                                       htmlspecialchars( serialize( $param ) );
+                               trigger_error( $warning, E_USER_WARNING );
+                               $e = new Exception;
+                               wfDebugLog( 'Bug58676', $warning . "\n" . $e->getTraceAsString() );
+
                                return array( 'before', '[INVALID]' );
                        }
                } elseif ( $param instanceof Message ) {
@@ -841,7 +843,7 @@ class Message {
         */
        protected function parseText( $string ) {
                $out = MessageCache::singleton()->parse( $string, $this->title, /*linestart*/true, $this->interface, $this->language );
-               return is_object( $out ) ? $out->getText() : $out;
+               return $out instanceof ParserOutput ? $out->getText() : $out;
        }
 
        /**