Check $_connection is not null before trying to use it

Stops a fatal error if calling isConnected() after disconnect().
cakephp · Sep 21, 2015 · 1b33efa · 1b33efa
1 parent 8fae10a
commit 1b33efa
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
@@ -857,10 +857,14 @@ public function name($data) {
  * @return bool True if the database is connected, else false
  */
 	public function isConnected() {
-		try {
-			$connected = $this->_connection->query('SELECT 1');
-		} catch (Exception $e) {
+		if (is_null($this->_connection)) {
 			$connected = false;
+		} else {
+			try {
+				$connected = $this->_connection->query('SELECT 1');
+			} catch (Exception $e) {
+				$connected = false;
+			}
 		}
 		$this->connected = ! empty($connected);
 		return $this->connected;