From ba80426504814a1b540fb65ec9d7e27526bd13b3 Mon Sep 17 00:00:00 2001
From: tomash <tomash@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Sun, 15 Oct 2006 13:13:14 +0000
Subject: [PATCH] #1847 trigger_error added if DB::connect return error object

---
 .../src/modules/storageServer/var/xmlrpc/xrLocStor.php     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/livesupport/src/modules/storageServer/var/xmlrpc/xrLocStor.php b/livesupport/src/modules/storageServer/var/xmlrpc/xrLocStor.php
index 7dc5f7fb6..42a28c233 100644
--- a/livesupport/src/modules/storageServer/var/xmlrpc/xrLocStor.php
+++ b/livesupport/src/modules/storageServer/var/xmlrpc/xrLocStor.php
@@ -6,7 +6,6 @@
 
 /* ====================================================== specific PHP config */
 ini_set("mbstring.internal_encoding", 'UTF-8');
-//error_reporting(0);
 ini_set("html_errors", FALSE);
 ini_set("error_prepend_string", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <methodResponse>
@@ -58,8 +57,10 @@ if(PHP5){
 }
 
 /* ============================================================= runable code */
-#PEAR::setErrorHandling(PEAR_ERROR_RETURN);
-$dbc =& DB::connect($config['dsn'], TRUE);
+$r = $dbc =& DB::connect($config['dsn'], TRUE);
+if(PEAR::isError($r)){
+    trigger_error("DB::connect: ".$r->getMessage()." ".$r->getUserInfo(),E_USER_ERROR);
+}
 $dbc->setErrorHandling(PEAR_ERROR_RETURN);
 $dbc->setFetchMode(DB_FETCHMODE_ASSOC);