diff --git a/pear/DB.php b/pear/DB.php index 2e53f79e6d1..d9b809ea69e 100644 --- a/pear/DB.php +++ b/pear/DB.php @@ -152,6 +152,14 @@ if (!defined('DB_GETMODE_DEFAULT')) { * @since PHP 4.0 */ class DB { + + function DB ($dsn = false, $persistent = false) + { + if ($dsn) { + return DB::connect ($dsn, $persistent); + } + } + // {{{ factory() /** @@ -162,7 +170,7 @@ class DB { * @return object a newly created DB object, or a DB error code on * error */ - function &factory($type) { + function &factory($type) { @include_once("DB/${type}.php"); $classname = 'DB_' . $type; $obj = @new $classname; @@ -170,7 +178,7 @@ class DB { return new DB_Error(DB_ERROR_NOT_FOUND); } return $obj; - } + } // }}} // {{{ connect() diff --git a/pear/PEAR.php.in b/pear/PEAR.php.in index b1b4182a904..35753309260 100644 --- a/pear/PEAR.php.in +++ b/pear/PEAR.php.in @@ -143,6 +143,7 @@ class PEAR_Error var $mode = PEAR_ERROR_RETURN; var $level = E_USER_NOTICE; + var $code = -1; var $message = ''; @@ -205,6 +206,19 @@ class PEAR_Error } + // }}} + // {{{ getCode() + + /** + * Get error code from an error object + * + * @return int error code + */ + function getCode () + { + return ($this->code); + } + // }}} // {{{ getType()