From dacf0cb02c3c44a30dc856dd9847c7f3dc1b3fab Mon Sep 17 00:00:00 2001
From: shachar058 <shaharzi@matrix.co.il>
Date: Wed, 21 Jun 2017 09:24:55 +0100
Subject: [PATCH] added ability to not show sql query errors (#877)

---
 library/sql.inc | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/library/sql.inc b/library/sql.inc
index 0e99452b4..75dbbc20f 100644
--- a/library/sql.inc
+++ b/library/sql.inc
@@ -514,22 +514,38 @@ function sqlNumRows($r)
 */
 function HelpfulDie ($statement, $sqlerr='')
 {
-  echo "<p><p><font color='red'>ERROR:</font> ".text($statement)."<p>";
+
+  if($GLOBALS['sql_string_no_show_screen']){
+    echo "<h2>" . xlt('Save Unsuccessful.') . "</h2>";
+  }
+  else {
+    echo "<p><p><font color='red'>ERROR:</font> " . text($statement) . "<p>";
+  }
+
   $logMsg="SQL Error with statement:".$statement;
+
   if ($sqlerr) {
-    echo "Error: <font color='red'>".text($sqlerr)."</font><p>";
+    if(!$GLOBALS['sql_string_no_show_screen']) {
+       echo "Error: <font color='red'>" . text($sqlerr) . "</font><p>";
+    }
     $logMsg.="--".$sqlerr;
   }//if error
-  $backtrace=debug_backtrace();
-  for($level=1;$level<count($backtrace);$level++)
-  {
-      $info=$backtrace[$level];
-      echo "<br>".text($info["file"]." at ".$info["line"].":".$info["function"]);
-      if($level>1){
-          echo "(".text(implode(",",$info["args"])).")";
+
+  $backtrace = debug_backtrace();
+
+  if(!$GLOBALS['sql_string_no_show_screen']) {
+      for ($level = 1; $level < count($backtrace); $level++)
+      {
+          $info = $backtrace[$level];
+          echo "<br>" . text($info["file"] . " at " . $info["line"] . ":" . $info["function"]);
+          if ($level > 1) {
+              echo "(" . text(implode(",", $info["args"])) . ")";
+          }
       }
   }
+
   $logMsg.="==>".$backtrace[1]["file"]." at ".$backtrace[1]["line"].":".$backtrace[1]["function"];
+
   error_log($logMsg);
 
   exit;
-- 
2.11.4.GIT