Fix for r86722: pass the message 'dberrortext' unescaped to the output since it conta...

diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php
index 4838d02..732b387 100644 (file)
--- a/includes/db/DatabaseError.php
+++ b/includes/db/DatabaseError.php
@@ -265,13 +265,18 @@ class DBQueryError extends DBError {
         */
        function getContentMessage( $html ) {
                if ( $this->useMessageCache() ) {
-                       $msg = $html ? 'dberrortext' : 'dberrortextcl';
-                       $ret = wfMsg( $msg, $this->getSQL(),
-                               $this->fname, $this->errno, $this->error );
                        if ( $html ) {
-                               $ret = htmlspecialchars( $ret );
+                               $msg = 'dberrortext';
+                               $sql = htmlspecialchars( $this->getSQL() );
+                               $fname = htmlspecialchars( $this->fname );
+                               $error = htmlspecialchars( $this->error );
+                       } else {
+                               $msg = 'dberrortextcl';
+                               $sql = $this->getSQL();
+                               $fname = $this->fname;
+                               $error = $this->error;
                        }
-                       return $ret;
+                       return wfMsg( $msg, $sql, $fname, $this->errno, $error );
                } else {
                        return parent::getContentMessage( $html );
                }