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, 40 insertions, 0 deletions

diff --git a/system/libraries/drivers/Log/Database.php b/system/libraries/drivers/Log/Database.php
new file mode 100644
index 00000000..19db9747
--- /dev/null
+++ b/system/libraries/drivers/Log/Database.php
@@ -0,0 +1,40 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+/**
+ * Log API driver.
+ *
+ * $Id: Database.php 4679 2009-11-10 01:45:52Z isaiah $
+ *
+ * @package    Kohana_Log
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Log_Database_Driver extends Log_Driver {
+
+	public function save(array $messages)
+	{
+		$insert = db::build($this->config['group'])
+						->insert($this->config['table'])
+						->columns(array('date', 'level', 'message'));
+
+		$run_insert = FALSE;
+
+		foreach ($messages AS $message)
+		{
+			if ($this->config['log_levels'][$message['type']] <= $this->config['log_threshold'])
+			{
+				// Add new message to database
+				$insert->values($message);
+
+				// There is data to insert
+				$run_insert = TRUE;
+			}
+		}
+
+		// Update the database
+		if ($run_insert)
+		{
+			$insert->execute();
+		}
+	}
+}
\ No newline at end of file