summaryrefslogtreecommitdiffstats
path: root/system/database/DB.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-15 18:00:53 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-15 18:00:53 +0200
commit4fbda2a8814be5837ad3928c5e3cb8506bf8ab2a (patch)
tree89a5360e805bd2b68771630f45801e67bd95775e /system/database/DB.php
parentdbac73b4011a85c4ac3b3a7a6a8e30533b881155 (diff)
parent08d186492af82a7087c0a45a80b7e8d469c83292 (diff)
Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into develop
Diffstat (limited to 'system/database/DB.php')
-rwxr-xr-x[-rw-r--r--]system/database/DB.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/system/database/DB.php b/system/database/DB.php
index 33207d885..8314d3b97 100644..100755
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -21,6 +21,8 @@
* @category Database
* @author ExpressionEngine Dev Team
* @link http://codeigniter.com/user_guide/database/
+ * @param string
+ * @param bool Determines if active record should be used or not
*/
function &DB($params = '', $active_record_override = NULL)
{
@@ -35,7 +37,7 @@ function &DB($params = '', $active_record_override = NULL)
show_error('The configuration file database.php does not exist.');
}
}
-
+
include($file_path);
if ( ! isset($db) OR count($db) == 0)