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

3 files changed, 6 insertions, 2 deletions

diff --git a/modules/akismet/views/admin_akismet.html.php b/modules/akismet/views/admin_akismet.html.php
index 9963f223..cc5e3cfc 100644
--- a/modules/akismet/views/admin_akismet.html.php
+++ b/modules/akismet/views/admin_akismet.html.php
@@ -2,7 +2,9 @@
 <div id="gAdminAkismet">
   <h1> <?= t("Akismet Spam Filtering") ?> </h1>
   <p>
-    <?= t("Akismet is a free, automated spam filtering service.  In order to use it, you need to sign up for a <a href=\"http://wordpress.com/api-keys\">Wordpress.com API Key</a>, which is also free.  Your comments will be automatically relayed to <a href=\"http://akismet.com\">Akismet.com</a> where they'll be scanned for spam.  Spam messages will be flagged accordingly and hidden from your vistors until you approve or delete them.") ?>
+  <?= t("Akismet is a free, automated spam filtering service.  In order to use it, you need to sign up for a <a href=\"%api_key_url\">Wordpress.com API Key</a>, which is also free.  Your comments will be automatically relayed to <a href=\"%akismet_url\">Akismet.com</a> where they'll be scanned for spam.  Spam messages will be flagged accordingly and hidden from your vistors until you approve or delete them.",
+	array("api_key_url" => "http://wordpress.com/api-keys",
+	      "akismet_url" => "http://akismet.com")) ?>
   </p>
 
   <? if ($valid_key): ?>
diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index 352fe522..9fa04305 100644
--- a/modules/gallery/helpers/task.php
+++ b/modules/gallery/helpers/task.php
@@ -84,6 +84,7 @@ class task_Core {
       }
       $task->save();
     } catch (Exception $e) {
+      Kohana::log("error", $e->__toString());
       $task->log($e->__toString());
       $task->state = "error";
       $task->done = true;
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index f68392ce..bfb96506 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -150,7 +150,8 @@ class Server_Add_Controller extends Admin_Controller {
             $queue[] = array($child, $entry->id);
           } else {
             $ext = strtolower(pathinfo($child, PATHINFO_EXTENSION));
-            if (in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4"))) {
+            if (in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4")) &&
+                filesize($child) > 0) {
               $child_entry = ORM::factory("server_add_file");
               $child_entry->task_id = $task->id;
               $child_entry->file = $child;