summaryrefslogtreecommitdiffstats
path: root/system/database/DB.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-11-02 00:42:31 +0100
committerAndrey Andreev <narf@bofh.bg>2012-11-02 00:42:31 +0100
commitae85eb42aa2d5c6d9a41b3cf6c61a4bf1c9b0566 (patch)
treea58f3f659e53d5bc29b4c17e7e3d90fbb267f5dc /system/database/DB.php
parentf5ccd12b395a6d01c8ba1890f3639b753a345379 (diff)
DocBlocks for base DB classes
Partially fixes issue #1295.
Diffstat (limited to 'system/database/DB.php')
-rw-r--r--system/database/DB.php17
1 files changed, 15 insertions, 2 deletions
diff --git a/system/database/DB.php b/system/database/DB.php
index 676cb9ccd..79e5c7ad2 100644
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -32,8 +32,10 @@ defined('BASEPATH') OR exit('No direct script access allowed');
* @category Database
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/database/
- * @param string
- * @param bool Determines if query builder should be used or not
+ *
+ * @param string|string[] $params
+ * @param bool $query_builder_override
+ * Determines if query builder should be used or not
*/
function &DB($params = '', $query_builder_override = NULL)
{
@@ -149,11 +151,22 @@ function &DB($params = '', $query_builder_override = NULL)
require_once(BASEPATH.'database/DB_query_builder.php');
if ( ! class_exists('CI_DB'))
{
+ /**
+ * CI_DB
+ *
+ * Acts as an alias for both CI_DB_driver and CI_DB_query_builder.
+ *
+ * @see CI_DB_query_builder
+ * @see CI_DB_driver
+ */
class CI_DB extends CI_DB_query_builder { }
}
}
elseif ( ! class_exists('CI_DB'))
{
+ /**
+ * @ignore
+ */
class CI_DB extends CI_DB_driver { }
}