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

7 files changed, 23 insertions, 18 deletions

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();
     }
 
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 "";
     }
   }
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>
diff --git a/modules/gallery/views/movieplayer.html.php b/modules/gallery/views/movieplayer.html.php
index e8cabd31..e9783eb8 100644
--- a/modules/gallery/views/movieplayer.html.php
+++ b/modules/gallery/views/movieplayer.html.php
@@ -1,15 +1,22 @@
 <?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") ?>", {
-    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>
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 27852904..898be509 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -516,7 +516,7 @@ class Organize_Controller extends Controller {
       break;
 
     case "delete":
-      return array("description" => t("Delete selected photos and albums"),
+      return array("description" => t("Delete selected photos / albums"),
                    "name" => t("Delete images in %name", array("name" => $item->title)),
                    "type" => "delete",
                    "runningMsg" => t("Delete images in progress"),
@@ -537,4 +537,4 @@ class Organize_Controller extends Controller {
       throw new Exception("Operation '$operation' is not implmented");
     }
   }
-}
\ No newline at end of file
+}
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 0be0f698..f68392ce 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -239,7 +239,7 @@ class Server_Add_Controller extends Admin_Controller {
         $entry->save();
       }
       $task->set("completed_files", $completed_files);
-      $task->status = t("Adding photos and albums (%completed of %total)",
+      $task->status = t("Adding photos / albums (%completed of %total)",
                         array("completed" => $completed_files,
                               "total" => $total_files));
       $task->percent_complete = 10 + 100 * ($completed_files / $total_files);
@@ -252,7 +252,7 @@ class Server_Add_Controller extends Admin_Controller {
       $task->percent_complete = 100;
       ORM::factory("server_add_file")->where("task_id", $task->id)->delete_all();
       message::info(t2("Successfully added one photo / album",
-                       "Successfully added %count photos and albums",
+                       "Successfully added %count photos / albums",
                        $task->get("completed_files")));
     }
   }
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index 1fb2e940..5efa6a19 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -85,7 +85,6 @@ class tag_Core {
    * @return array
    */
   static function item_tags($item) {
-    access::required("view", $item);
     $tags = array();
     foreach (Database::instance()
              ->select("name")