* drop the ondemand connect stuff for now

diff --git a/pear/DB.php b/pear/DB.php
index 22cff1f81cbfaeccde3a6b475fb939d855a9b4eb..75b12e79445372c6c625b7614309886e14acb10f 100644 (file)
--- a/pear/DB.php
+++ b/pear/DB.php
@@ -127,8 +127,8 @@ define('DB_FETCHMODE_ORDERED', 1);
 define('DB_FETCHMODE_ASSOC', 2);
 
 /**
-* Column data as object properties
-*/
+ * Column data as object properties
+ */
 
 define('DB_FETCHMODE_OBJECT', 3);
 
@@ -180,7 +180,6 @@ define('DB_TABLEINFO_FULL', 3);
  *              class.
  *
  * @package  DB
- * @version  2
  * @author   Stig Bakken <ssb@fast.no>
  * @since    PHP 4.0
  */
@@ -261,9 +260,6 @@ class DB
 
         @$obj =& new $classname;
 
-        if (isset($options['connect_ondemand']) && !extension_loaded("overload")) {
-            unset($options['connect_ondemand']);
-        }
         if (is_array($options)) {
             foreach ($options as $option => $value) {
                 $test = $obj->setOption($option, $value);
@@ -274,14 +270,10 @@ class DB
         } else {
             $obj->setOption('persistent', $options);
         }
-        if (!$obj->getOption('connect_ondemand')) {
-            $err = $obj->connect($dsninfo, $obj->getOption('persistent'));
-            if (DB::isError($err)) {
-                $err->addUserInfo($dsn);
-                return $err;
-            }
-        } else {
-            $obj->dsn = $dsninfo;
+        $err = $obj->connect($dsninfo, $obj->getOption('persistent'));
+        if (DB::isError($err)) {
+            $err->addUserInfo($dsn);
+            return $err;
         }
 
         return $obj;