Changeset 1410 for trunk/bb-admin/class-install.php

Timestamp:

04/11/2008 09:55:51 AM (18 years ago)

Author:

mdawaffe

Message:

ignore config.php if bb-config.php found. validate_current_database() with explicit db_connect. Fixes #855

File:

• trunk/bb-admin/class-install.php (modified) (2 diffs)

trunk/bb-admin/class-install.php

@@ -412 +412 @@
         }
         
-        if ($this->configs['config.php']) {
+        if ($this->configs['config.php'] && !$this->configs['bb-config.php']) {
             // There is an old school config file
             // Step -1 is where we send fatal errors from any screen
@@ -521 +521 @@
             global $bbdb;
         }
-        
-        if (!is_resource($bbdb->dbh_local)) {
+
+        $db = $bbdb->db_connect( "SELECT * FROM $bbdb->forums LIMIT 1" );
+
+        if (!is_resource($db)) {
             return false;
         }