Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

1 files changed, 1 insertions, 9 deletions

diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index 96dcc71b..eb55aca6 100644
--- a/modules/gallery/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
@@ -38,16 +38,8 @@ class View extends View_Core {
     try {
       return parent::render($print, $renderer);
     } catch (Exception $e) {
-      Kohana::Log('error', $e->getTraceAsString());
-      Kohana::Log('debug', $e->getMessage());
+      Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
       return "";
     }
   }
-
-  public function body_attributes() {
-    if (locale::is_rtl()) {
-      return 'class="rtl"';
-    }
-    return '';
-  }
 }