Fix return value of Formatter.toString() when type is text

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Dec 5, 2016 · 5f79069 · 5f79069
1 parent fa440b9
commit 5f79069
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+* Fix return value of Formatter.toString() when type is text
+
 ## [3.4.14] - 2016-11-30
 
 * Improved parsing of UNION queries.

diff --git a/src/Utils/Formatter.php b/src/Utils/Formatter.php
@@ -487,6 +487,7 @@ public function toString($token)
         } elseif ($this->options['type'] === 'html') {
             return htmlspecialchars($text, ENT_NOQUOTES);
         }
+        return $text;
     }
 
     /**