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

5 files changed, 7 insertions, 7 deletions

diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index abc8a195..67900282 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -92,7 +92,7 @@ class gallery_block_Core {
     $form = new Forge("admin/dashboard/add_block", "", "post",
                       array("id" => "gAddDashboardBlockForm"));
     $group = $form->group("add_block")->label(t("Add Block"));
-    $group->dropdown("id")->label("Available Blocks")->options(block_manager::get_available());
+    $group->dropdown("id")->label(t("Available Blocks"))->options(block_manager::get_available());
     $group->submit("center")->value(t("Add to center"));
     $group->submit("sidebar")->value(t("Add to sidebar"));
     return $form;
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 25eb0891..feebfb34 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -326,6 +326,7 @@ class graphics_Core {
     if (!isset($gd["GD Version"])) {
       $gd["GD Version"] = false;
     }
+    putenv("PATH=" . getenv("PATH") . ":/usr/local/bin");
     return array("gd" => $gd,
                  "imagemagick" => $exec ? dirname(exec("which convert")) : false,
                  "graphicsmagick" => $exec ? dirname(exec("which gm")) : false);
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 986d5f62..1d1d29d1 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -140,13 +140,11 @@ class movie_Core {
 
   static function find_ffmpeg() {
     if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) {
+      putenv("PATH=" . getenv("PATH") . ":/usr/local/bin");
       if (function_exists("exec")) {
         $ffmpeg_path = exec("which ffmpeg");
       }
 
-      if (empty($ffmpeg) && @file_exists("/usr/local/bin/ffmpeg")) {
-        $ffmpeg_path = "/usr/local/bin/ffmpeg";
-      }
       module::set_var("gallery", "ffmpeg_path", $ffmpeg_path);
     }
     return $ffmpeg_path;
diff --git a/modules/gallery/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php
index adf2bd94..0f60070a 100644
--- a/modules/gallery/views/permissions_form.html.php
+++ b/modules/gallery/views/permissions_form.html.php
@@ -69,7 +69,7 @@
           <? elseif ($intent === access::ALLOW): ?>
             <td class="gAllowed">
               <? if ($item->id == 1): ?>
-                <img src="<?= url::file('themes/default/images/ico-success.png') ?>" title="allowed" alt="<?= t('allowed icon') ?>" />
+                <img src="<?= url::file('themes/default/images/ico-success.png') ?>" title="<?= t("allowed") ?>" alt="<?= t('allowed icon') ?>" />
               <? else: ?>
                 <a href="javascript:set('reset',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
                   title="<?= t('allowed, click to reset') ?>">
diff --git a/modules/server_add/helpers/server_add_task.php b/modules/server_add/helpers/server_add_task.php
index 98575915..0482b47c 100644
--- a/modules/server_add/helpers/server_add_task.php
+++ b/modules/server_add/helpers/server_add_task.php
@@ -56,11 +56,12 @@ class server_add_task_Core {
         } else {
           $extension = strtolower(substr(strrchr($name, '.'), 1));
           $source_path = "$path{$file['path']}/$name";
+          $title = item::convert_filename_to_title($name);
           if (in_array($extension, array("flv", "mp4"))) {
-            $movie = movie::create($parent, $source_path, $name, $name,
+            $movie = movie::create($parent, $source_path, $name, $title,
                                    null, user::active()->id);
           } else {
-            $photo = photo::create($parent, $source_path, $name, $name,
+            $photo = photo::create($parent, $source_path, $name, $title,
                                    null, user::active()->id);
           }
         }