Changeset 6458 for branches/2.3

Timestamp:

12/21/2007 07:28:21 PM (18 years ago)

Author:

ryan

Message:

Return after bailing since bail doesn't always die now. Don't do queries if constructor didn't complete. see #5495

File:

• branches/2.3/wp-includes/wp-db.php (modified) (5 diffs)

branches/2.3/wp-includes/wp-db.php

@@ -21 +21 @@
     var $col_info;
     var $queries;
+    var $ready = false;
 
     // Our tables
@@ -75 +76 @@
 <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
 ");
+            return;
         }
 
@@ -81 +83 @@
 
         $this->select($dbname);
+        $this->ready = true;
     }
 
@@ -102 +105 @@
 </ul>
 <p>If you don't know how to setup a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>");
+            return;
         }
     }
@@ -196 +200 @@
 
     function query($query) {
+        if ( ! $ready )
+            return false;
+
         // filter the query, if filters are available
         // NOTE: some queries are made before the plugins have been loaded, and thus cannot be filtered with this method