lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes sur les inclusions de fichiers

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2004-07-20 17:41:40 +00:00
parent 7903ef6d1b
commit 6e289a60bf
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/includes/pear/Auth/Container/DB.php
View File

@ -108,8 +108,8 @@ class Auth_Container_DB extends Auth_Container
); );
} }
if (DB::isError($this->db) || PEAR::isError($this->db)) { if (DB::isError($this->db) || DOLIPEAR::isError($this->db)) {
return PEAR::raiseError($this->db->getMessage(), $this->db->getCode()); return DOLIPEAR::raiseError($this->db->getMessage(), $this->db->getCode());
} else { } else {
return true; return true;
} }
@ -131,7 +131,7 @@ class Auth_Container_DB extends Auth_Container
{ {
if (!DB::isConnection($this->db)) { if (!DB::isConnection($this->db)) {
$res = $this->_connect($this->options['dsn']); $res = $this->_connect($this->options['dsn']);
if(DB::isError($res) || PEAR::isError($res)){ if(DB::isError($res) || DOLIPEAR::isError($res)){
return $res; return $res;
} }
} }

8
htdocs/includes/pear/DB.php
View File

@ -224,12 +224,12 @@ class DB
function &factory($type) 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}"; $classname = "DB_${type}";
if (!class_exists($classname)) { 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); null, null, null, 'DB_Error', true);
} }
@ -275,12 +275,12 @@ class DB
// expose php errors with sufficient debug level // expose php errors with sufficient debug level
include_once DOL_DOCUMENT_ROOT."/includes/pear/DB/${type}.php"; include_once DOL_DOCUMENT_ROOT."/includes/pear/DB/${type}.php";
} else { } else {
@include_once DOL_DOCUMENT_ROOT."/includes/pear/DB/${type}.php"; include_once DOL_DOCUMENT_ROOT."/includes/pear/DB/${type}.php";
} }
$classname = "DB_${type}"; $classname = "DB_${type}";
if (!class_exists($classname)) { 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'", "Unable to include the DB/{$type}.php file for `$dsn'",
'DB_Error', true); 'DB_Error', true);
} }

10
htdocs/includes/pear/DB/common.php
View File

@ -26,9 +26,9 @@
* inherited by all such. * 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 // {{{ properties
/** /**
@ -136,7 +136,7 @@ class DB_common extends PEAR
*/ */
function DB_common() function DB_common()
{ {
$this->PEAR('DB_Error'); $this->DOLIPEAR('DB_Error');
$this->features = array(); $this->features = array();
$this->errorcode_map = array(); $this->errorcode_map = array();
$this->fetchmode = DB_FETCHMODE_ORDERED; $this->fetchmode = DB_FETCHMODE_ORDERED;
@ -283,7 +283,7 @@ class DB_common extends PEAR
$mode = $this->_default_error_mode; $mode = $this->_default_error_mode;
$options = $this->_default_error_options; $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) { if ($userinfo === null) {
@ -294,7 +294,7 @@ class DB_common extends PEAR
$userinfo .= " [nativecode=$nativecode]"; $userinfo .= " [nativecode=$nativecode]";
} }
return PEAR::raiseError(null, $code, $mode, $options, $userinfo, return DOLIPEAR::raiseError(null, $code, $mode, $options, $userinfo,
'DB_Error', true); 'DB_Error', true);
} }

2
htdocs/includes/pear/DB/mysql.php
View File

@ -29,7 +29,7 @@
// be registered here. // be registered here.
// //
require_once "DB/common.php"; require_once DOL_DOCUMENT_ROOT."/includes/pear/DB/common.php";
class DB_mysql extends DB_common class DB_mysql extends DB_common
{ {