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

diff --git a/system/libraries/ORM_Validation_Exception.php b/system/libraries/ORM_Validation_Exception.php
new file mode 100644
index 00000000..95f96c3b
--- /dev/null
+++ b/system/libraries/ORM_Validation_Exception.php
@@ -0,0 +1,26 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * ORM Validation exceptions.
+ * 
+ * $Id: ORM_Validation_Exception.php 4679 2009-11-10 01:45:52Z isaiah $
+ * 
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class ORM_Validation_Exception_Core extends Database_Exception {
+	
+	/**
+	 * Handles Database Validation Exceptions
+	 * 
+	 * @param Validation $array
+	 * @return 
+	 */
+	public static function handle_validation($table, Validation $array) 
+	{
+		$exception = new ORM_Validation_Exception('ORM Validation has failed for :table model',array(':table'=>$table));
+		$exception->validation = $array;
+		throw $exception;
+	} 
+} // End ORM_Validation_Exception
\ No newline at end of file