summaryrefslogtreecommitdiffstats
path: root/system/database/DB.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-15 01:15:12 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-15 01:15:12 +0200
commit08d186492af82a7087c0a45a80b7e8d469c83292 (patch)
tree795ecf075e524e4a33d98a90580eb4dcabf80040 /system/database/DB.php
parent2369e77dcd716c772576c1f982e9446785db819d (diff)
parent07b53422f8d61e6b0b7e6479b0de92ad1a1ce05e (diff)
Merge pull request #52 from waldmeister/develop
Added some docs to CI core files
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)