Merge branch 'master' into dialog

1 files changed, 4 insertions, 0 deletions

diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index d76e25ff..ded77792 100644
--- a/modules/gallery/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
@@ -67,6 +67,10 @@ class View extends View_Core {
     try {
       $this->kohana_local_data = array_merge(View::$global_data, $this->kohana_local_data);
       return parent::render($print, $renderer, $modifier);
+    } catch (ORM_Validation_Exception $e) {
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+      Kohana_Log::add("error", "Validation errors: " . print_r($e->validation->errors(), 1));
+      return "";
     } catch (Exception $e) {
       Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
       return "";