From 3aea4dd118208d6d7859ebf1d32249a8644b655b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 20 Jul 2009 18:47:32 -0700
Subject: Dump out the error message along with the stack trace when we catch
 an exception from View::render()

---
 modules/gallery/libraries/MY_View.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index 84ee0892..43783158 100644
--- a/modules/gallery/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
@@ -38,8 +38,7 @@ 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 "";
     }
   }
-- 
cgit v1.2.3


From 1a96ce145cfa529708852a46d4cab3c0d4d1b37e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 20 Jul 2009 20:47:47 -0700
Subject: Don't let the task status message exceed the size of the status
 column when there's an error.

---
 modules/gallery/helpers/task.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index 6a9f63c2..352fe522 100644
--- a/modules/gallery/helpers/task.php
+++ b/modules/gallery/helpers/task.php
@@ -87,7 +87,7 @@ class task_Core {
       $task->log($e->__toString());
       $task->state = "error";
       $task->done = true;
-      $task->status = $e->getMessage();
+      $task->status = substr($e->getMessage(), 0, 255);
       $task->save();
     }
 
-- 
cgit v1.2.3


From 653badc2e1b9753f29bbb1d9fec8098716a4a2f4 Mon Sep 17 00:00:00 2001
From: hiwilson <wilsonpscheung@gmail.com>
Date: Tue, 21 Jul 2009 09:44:51 +0800
Subject: set wmode='transparent' other than flowplayer.js (cherry picked from
 commit 79a46658196a98a3972983cc422d1ee544b09d4a)

---
 modules/gallery/views/movieplayer.html.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/movieplayer.html.php b/modules/gallery/views/movieplayer.html.php
index e8cabd31..28324a54 100644
--- a/modules/gallery/views/movieplayer.html.php
+++ b/modules/gallery/views/movieplayer.html.php
@@ -1,7 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= html::anchor($item->file_url(true), "", $attrs) ?>
 <script>
-  flowplayer("<?= $attrs["id"] ?>", "<?= url::abs_file("lib/flowplayer.swf") ?>", {
+  flowplayer("<?= $attrs["id"] ?>", {src: "<?= url::abs_file("lib/flowplayer.swf") ?>",
+      wmode: "transparent"}, {
     plugins: {
       h264streaming: {
         url: "<?= url::abs_file("lib/flowplayer.h264streaming.swf") ?>"
-- 
cgit v1.2.3


From 67e83e66c6c302d3bf2d0a6aa52d1f7d2ed991e5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 20 Jul 2009 22:12:39 -0700
Subject: Fix indentation

---
 modules/gallery/views/movieplayer.html.php | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/movieplayer.html.php b/modules/gallery/views/movieplayer.html.php
index 28324a54..e9783eb8 100644
--- a/modules/gallery/views/movieplayer.html.php
+++ b/modules/gallery/views/movieplayer.html.php
@@ -1,16 +1,22 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= html::anchor($item->file_url(true), "", $attrs) ?>
 <script>
-  flowplayer("<?= $attrs["id"] ?>", {src: "<?= url::abs_file("lib/flowplayer.swf") ?>",
-      wmode: "transparent"}, {
-    plugins: {
-      h264streaming: {
-        url: "<?= url::abs_file("lib/flowplayer.h264streaming.swf") ?>"
-      },
-      controls: {
-        autoHide: 'always',
-        hideDelay: 2000
+  flowplayer(
+    "<?= $attrs["id"] ?>",
+    {
+      src: "<?= url::abs_file("lib/flowplayer.swf") ?>",
+      wmode: "transparent"
+    },
+    {
+      plugins: {
+        h264streaming: {
+          url: "<?= url::abs_file("lib/flowplayer.h264streaming.swf") ?>"
+        },
+        controls: {
+          autoHide: 'always',
+          hideDelay: 2000
+        }
       }
     }
-  })
+  )
 </script>
-- 
cgit v1.2.3


From b99774ac49999e4701f1c410f0018a417a5f613e Mon Sep 17 00:00:00 2001
From: Shai Ben-Naphtali <shai@shaibn.com>
Date: Tue, 21 Jul 2009 12:13:13 +0800
Subject: Fixed grammer and set lowercase for the word project (minor change)

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
---
 modules/gallery/views/after_install.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/after_install.html.php b/modules/gallery/views/after_install.html.php
index d6ba8e7c..e4842163 100644
--- a/modules/gallery/views/after_install.html.php
+++ b/modules/gallery/views/after_install.html.php
@@ -21,7 +21,7 @@
 </p>
 
 <p>
-  <?= t("Want to learn more? The <a href=\"%url\">Gallery website</a> has news and information about Gallery Project and community.", array("url" => "http://gallery.menalto.com")) ?>
+  <?= t("Want to learn more? The <a href=\"%url\">Gallery website</a> has news and information about the Gallery project and community.", array("url" => "http://gallery.menalto.com")) ?>
 </p>
 
 <p>
-- 
cgit v1.2.3