diff --git a/htdocs/includes/pear/Auth/Container/DB.php b/htdocs/includes/pear/Auth/Container/DB.php index 81f3f5ea4fc..1a6d2d396df 100644 --- a/htdocs/includes/pear/Auth/Container/DB.php +++ b/htdocs/includes/pear/Auth/Container/DB.php @@ -108,8 +108,8 @@ class Auth_Container_DB extends Auth_Container ); } - if (DB::isError($this->db) || PEAR::isError($this->db)) { - return PEAR::raiseError($this->db->getMessage(), $this->db->getCode()); + if (DB::isError($this->db) || DOLIPEAR::isError($this->db)) { + return DOLIPEAR::raiseError($this->db->getMessage(), $this->db->getCode()); } else { return true; } @@ -131,7 +131,7 @@ class Auth_Container_DB extends Auth_Container { if (!DB::isConnection($this->db)) { $res = $this->_connect($this->options['dsn']); - if(DB::isError($res) || PEAR::isError($res)){ + if(DB::isError($res) || DOLIPEAR::isError($res)){ return $res; } } diff --git a/htdocs/includes/pear/DB.php b/htdocs/includes/pear/DB.php index 164b8aa3be8..868a150a7cd 100644 --- a/htdocs/includes/pear/DB.php +++ b/htdocs/includes/pear/DB.php @@ -224,12 +224,12 @@ class DB function &factory($type) { - @include_once(DOL_DOCUMENT_ROOT."/includes/pear/DB/${type}.php"); + include_once(DOL_DOCUMENT_ROOT."/includes/pear/DB/${type}.php"); $classname = "DB_${type}"; if (!class_exists($classname)) { - return PEAR::raiseError(null, DB_ERROR_NOT_FOUND, + return DOLIPEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null, null, 'DB_Error', true); } @@ -275,12 +275,12 @@ class DB // expose php errors with sufficient debug level include_once DOL_DOCUMENT_ROOT."/includes/pear/DB/${type}.php"; } else { - @include_once DOL_DOCUMENT_ROOT."/includes/pear/DB/${type}.php"; + include_once DOL_DOCUMENT_ROOT."/includes/pear/DB/${type}.php"; } $classname = "DB_${type}"; if (!class_exists($classname)) { - return PEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null, + return DOLIPEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null, "Unable to include the DB/{$type}.php file for `$dsn'", 'DB_Error', true); } diff --git a/htdocs/includes/pear/DB/common.php b/htdocs/includes/pear/DB/common.php index a361e8af927..1811a6bde76 100644 --- a/htdocs/includes/pear/DB/common.php +++ b/htdocs/includes/pear/DB/common.php @@ -26,9 +26,9 @@ * inherited by all such. */ -require_once "PEAR.php"; +require_once DOL_DOCUMENT_ROOT."/includes/pear/PEAR.php"; -class DB_common extends PEAR +class DB_common extends DOLIPEAR { // {{{ properties /** @@ -136,7 +136,7 @@ class DB_common extends PEAR */ function DB_common() { - $this->PEAR('DB_Error'); + $this->DOLIPEAR('DB_Error'); $this->features = array(); $this->errorcode_map = array(); $this->fetchmode = DB_FETCHMODE_ORDERED; @@ -283,7 +283,7 @@ class DB_common extends PEAR $mode = $this->_default_error_mode; $options = $this->_default_error_options; } - return PEAR::raiseError($code, null, $mode, $options, null, null, true); + return DOLIPEAR::raiseError($code, null, $mode, $options, null, null, true); } if ($userinfo === null) { @@ -294,7 +294,7 @@ class DB_common extends PEAR $userinfo .= " [nativecode=$nativecode]"; } - return PEAR::raiseError(null, $code, $mode, $options, $userinfo, + return DOLIPEAR::raiseError(null, $code, $mode, $options, $userinfo, 'DB_Error', true); } diff --git a/htdocs/includes/pear/DB/mysql.php b/htdocs/includes/pear/DB/mysql.php index a8b92f41834..53fd4acf7f1 100644 --- a/htdocs/includes/pear/DB/mysql.php +++ b/htdocs/includes/pear/DB/mysql.php @@ -29,7 +29,7 @@ // be registered here. // -require_once "DB/common.php"; +require_once DOL_DOCUMENT_ROOT."/includes/pear/DB/common.php"; class DB_mysql extends DB_common {