Merge "Stash global only once per test case."

[lhc/web/wiklou.git] / includes / db / DatabaseError.php

diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php
index 53341c3..a53a674 100644 (file)
--- a/includes/db/DatabaseError.php
+++ b/includes/db/DatabaseError.php
@@ -318,7 +318,7 @@ class DBQueryError extends DBError {
                                $fname = $this->fname;
                                $error = $this->error;
                        }
-                       return wfMsg( $msg, $sql, $fname, $this->errno, $error );
+                       return wfMessage( $msg )->rawParams( $sql, $fname, $this->errno, $error )->text();
                } else {
                        return parent::getContentMessage( $html );
                }