Browse Source

* added Colin's connect/factory error reporting fix

PHP-4.0.6
Stig Bakken 26 years ago
parent
commit
ad8dbb8d10
  1. 14
      pear/DB.php

14
pear/DB.php

@ -185,13 +185,14 @@ class DB
@include_once("DB/${type}.php"); @include_once("DB/${type}.php");
$classname = "DB_${type}"; $classname = "DB_${type}";
@$obj =& new $classname;
if (!$obj) {
if (!class_exists($classname)) {
return PEAR::raiseError(DB_ERROR_NOT_FOUND, return PEAR::raiseError(DB_ERROR_NOT_FOUND,
null, null, null, null, 'DB_Error', true); null, null, null, null, 'DB_Error', true);
} }
@$obj =& new $classname;
return $obj; return $obj;
} }
@ -227,19 +228,18 @@ class DB
$options["debug"] >= 2) { $options["debug"] >= 2) {
// expose php errors with sufficient debug level // expose php errors with sufficient debug level
include_once "DB/${type}.php"; include_once "DB/${type}.php";
$classname = "DB_${type}";
$obj =& new $classname;
} else { } else {
@include_once "DB/${type}.php"; @include_once "DB/${type}.php";
$classname = "DB_${type}";
@$obj =& new $classname;
} }
if (!$obj) {
$classname = "DB_${type}";
if (!class_exists($classname)) {
return PEAR::raiseError(DB_ERROR_NOT_FOUND, return PEAR::raiseError(DB_ERROR_NOT_FOUND,
null, null, null, null, 'DB_Error', true); null, null, null, null, 'DB_Error', true);
} }
@$obj =& new $classname;
if (is_array($options)) { if (is_array($options)) {
foreach ($options as $option => $value) { foreach ($options as $option => $value) {
$test = $obj->setOption($option, $value); $test = $obj->setOption($option, $value);

Loading…
Cancel
Save