Treat hide_location error as user ones

Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Sep 2, 2016 · 829d51c · 829d51c
1 parent eb3e3b7
commit 829d51c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/libraries/Error.php b/libraries/Error.php
@@ -433,13 +433,13 @@ public function getDisplay()
     {
         $this->isDisplayed(true);
         $retval = '<div class="' . $this->getLevel() . '">';
-        if (! $this->isUserError() && ! $this->hide_location) {
+        if (! $this->isUserError()) {
             $retval .= '<strong>' . $this->getType() . '</strong>';
             $retval .= ' in ' . $this->getFile() . '#' . $this->getLine();
             $retval .= "<br />\n";
         }
         $retval .= $this->getMessage();
-        if (! $this->isUserError() && ! $this->hide_location) {
+        if (! $this->isUserError()) {
             $retval .= "<br />\n";
             $retval .= "<br />\n";
             $retval .= "<strong>Backtrace</strong><br />\n";
@@ -458,7 +458,8 @@ public function getDisplay()
      */
     public function isUserError()
     {
-        return $this->getNumber() & (E_USER_WARNING | E_USER_ERROR | E_USER_NOTICE);
+        return $this->hide_location ||
+            ($this->getNumber() & (E_USER_WARNING | E_USER_ERROR | E_USER_NOTICE));
     }
 
     /**