Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 49 insertions, 0 deletions

diff --git a/system/helpers/db.php b/system/helpers/db.php
new file mode 100644
index 00000000..ce7583b7
--- /dev/null
+++ b/system/helpers/db.php
@@ -0,0 +1,49 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database helper class.
+ *
+ * $Id: $
+ *
+ * @package    Core
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+ class db_Core {
+
+	public static function query($sql)
+	{
+		return new Database_Query($sql);
+	}
+
+	public static function build($database = 'default')
+	{
+		return new Database_Builder($database);
+	}
+
+	public static function select($columns = NULL)
+	{
+		return db::build()->select($columns);
+	}
+
+	public static function insert($table = NULL, $set = NULL)
+	{
+		return db::build()->insert($table, $set);
+	}
+
+	public static function update($table = NULL, $set = NULL, $where = NULL)
+	{
+		return db::build()->update($table, $set, $where);
+	}
+
+	public static function delete($table = NULL, $where = NULL)
+	{
+		return db::build()->delete($table, $where);
+	}
+
+	public static function expr($expression)
+	{
+		return new Database_Expression($expression);
+	}
+
+} // End db