From dcd7e45a41956eed76eae13dba787deb9baeca6f Mon Sep 17 00:00:00 2001
From: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
Date: Wed, 9 Jul 2014 12:05:50 +0530
Subject: [PATCH] Ignore php errors whenever '@' is used.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
---
 libraries/Error_Handler.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php
index ffeb1aff86..18d8b5a784 100644
--- a/libraries/Error_Handler.class.php
+++ b/libraries/Error_Handler.class.php
@@ -109,6 +109,7 @@ class PMA_Error_Handler
      * Error handler - called when errors are triggered/occurred
      *
      * This calls the addError() function, escaping the error string
+     * Ignores the errors wherever Error Control Operator (@) is used.
      *
      * @param integer $errno   error number
      * @param string  $errstr  error string
@@ -119,6 +120,10 @@ class PMA_Error_Handler
      */
     public function handleError($errno, $errstr, $errfile, $errline)
     {
+        // check if Error Control Operator (@) was used.
+        if (error_reporting() == 0) {
+            return;
+        }
         $this->addError($errstr, $errno, $errfile, $errline, true);
     }