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

diff --git a/system/libraries/Kohana_User_Exception.php b/system/libraries/Kohana_User_Exception.php
new file mode 100644
index 00000000..95b7bc68
--- /dev/null
+++ b/system/libraries/Kohana_User_Exception.php
@@ -0,0 +1,30 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+/**
+ * Creates a custom exception message.
+ *
+ * $Id: Kohana_User_Exception.php 4679 2009-11-10 01:45:52Z isaiah $
+ *
+ * @package    Core
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+
+class Kohana_User_Exception_Core extends Kohana_Exception {
+
+	/**
+	 * Set exception title and message.
+	 *
+	 * @param   string  exception title string
+	 * @param   string  exception message string
+	 * @param   string  custom error template
+	 */
+	public function __construct($title, $message, array $variables = NULL)
+	{
+		parent::__construct($message, $variables);
+
+		// Code is the error title
+		$this->code = $title;
+	}
+
+} // End Kohana User Exception