From 703e84a94d29d0f4798ad60540ee87734bbdd6d9 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Wed, 5 Aug 2009 09:58:49 +0800
Subject: Fix l10n message for akismet, extracting URLs from the message

Signed-off-by: Andy Staudacher <andy.st@gmail.com>
---
 modules/akismet/views/admin_akismet.html.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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): ?>
-- 
cgit v1.2.3


From fb9efa664b686c540708098ed6b55305c3a6084e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 4 Aug 2009 20:20:43 -0700
Subject: Check for the SimpleXML module, thanks to geekonek. Fixes ticket
 #599.

---
 installer/web.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/installer/web.php b/installer/web.php
index 78784539..f31c0644 100644
--- a/installer/web.php
+++ b/installer/web.php
@@ -104,6 +104,10 @@ function check_environment() {
     $errors[] = "PHP is missing the <a href=\"http://php.net/iconv\">iconv extension</a>";
   }
 
+  if (!(extension_loaded("simplexml"))) {
+    $errors[] = "PHP is missing the <a href=\"http://php.net/simplexml\">SimpleXML extension</a>";
+  }
+
   if (extension_loaded("mbstring") && (ini_get("mbstring.func_overload") & MB_OVERLOAD_STRING)) {
     $errors[] = "The <a href=\"http://php.net/mbstring\">mbstring extension</a> is overloading PHP's native string functions.  Please disable it.";
   }
-- 
cgit v1.2.3


From a03b9273b2afc61dfdea43f679e75639238cdcd7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 4 Aug 2009 20:34:46 -0700
Subject: Dump any exceptions into the standard Kohana log as well as the task
 log for maximum exposure.

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

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;
-- 
cgit v1.2.3


From b9a6cd45ba0b32a115dedd8b3fa3962eb82202e1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 4 Aug 2009 20:35:13 -0700
Subject: Skip empty files, since we know they're broken.  Fixes ticket #610.

---
 modules/server_add/controllers/server_add.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;
-- 
cgit v1.2.3