Trigger error when dbo source is not enabled.

cakephp · Jul 20, 2013 · 09c1b61 · 09c1b61
1 parent 143d7d7
commit 09c1b61
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -242,6 +242,15 @@ function getEncoding() {
 		return $row[0]['VALUE'];
 	}
 
+/**
+ * Check whether the OCI8 extension is installed/loaded
+ *
+ * @return boolean
+ */
+	function enabled() {
+		return extension_loaded('oci8');
+	}
+
 /**
  * Disconnects from database.
  *

diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
@@ -137,6 +137,7 @@ function __construct($config = null, $autoConnect = true) {
 		parent::__construct($config);
 		$this->fullDebug = Configure::read() > 1;
 		if (!$this->enabled()) {
+			trigger_error(sprintf(__('%s - Selected driver is not enabled', true), get_class($this)), E_USER_ERROR);
 			return false;
 		}
 		if ($autoConnect) {