Minor BugFix.

diff --git a/lib/SAMURAI/DB.php b/lib/SAMURAI/DB.php
index 03f40b52f46afafbb8dafb02f325b213eae74f61..98a2b66924529460d300e0d7b8ddc11caf39c533 100644 (file)
--- a/lib/SAMURAI/DB.php
+++ b/lib/SAMURAI/DB.php
@@ -48,12 +48,9 @@ class SAMURAI_DB extends DB {
     {
         $conf = parse_ini_file(dirname(__FILE__) . '/DB/consultas.ini', true);
         $db = DB::connect($conf['dsn'],$conf['opciones']);
-        if (DB::isError($db)) {
-             trigger_error($db->getMessage(), E_USER_ERROR);
-        }
         return $db;
     }
     // -X2C
 
 } // -X2C Class :SAMURAI_DB
-?>
\ No newline at end of file
+?>

diff --git a/sistema/local_lib/prepend.php b/sistema/local_lib/prepend.php
index 57331d5526739d7d5f0a6ace32711dc49347c9d5..fd3706d43a6a3e88ac3f76bfc32b0e482aad271d 100644 (file)
--- a/sistema/local_lib/prepend.php
+++ b/sistema/local_lib/prepend.php
@@ -5,18 +5,24 @@
 //prepend_include_path('/home/mmarrese/public_html/meconlib/lib/');
 
 require_once 'MECON/Marco.php';
+require_once 'MECON/HTML/Error.php';
 require_once 'SAMURAI/DB.php';
 require_once 'SAMURAI/Perm.php';
 require_once 'util.php';
 require_once 'SAMURAI/constantes.php';
-
-
 require_once 'MECON/Usuario.php';
 
 //Realizo la conexion con la base de datos
 $tmp = new SAMURAI_DB();
 $DB  =& $tmp->connect();
 
+if (PEAR::isError($DB)) {
+    $ERROR = new MECON_HTML_Error($DB->getMessage());
+    echo $ERROR->toHtml();
+    exit;
+}
+
+
 //CARGO LAS VARIABLES DE SESION INTERNAS {{{
 if (!isset($_SESSION['usuario'])) {
     header('Location: /sistemas/intranet/login?redirect='.$_SERVER['REQUEST_URI']);