2 files changed, 28 insertions, 11 deletions

diff --git a/modules/gallery/helpers/encoding.php b/modules/gallery/helpers/encoding.php
index c5928634..7d5add34 100644
--- a/modules/gallery/helpers/encoding.php
+++ b/modules/gallery/helpers/encoding.php
@@ -19,13 +19,16 @@
  */
 class encoding_Core {
   static function convert_to_utf8($value) {
-    if (function_exists("mb_detect_encoding") &&
-        function_exists("mb_convert_encoding") &&
-        mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
-      $value = mb_convert_encoding($value, "UTF-8", mb_detect_encoding($value));
-    } else if (function_exists("mb_detect_encoding") &&
-               mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
-      $value = utf8_encode($value);
+    if (function_exists("mb_detect_encoding")) {
+      // Rely on mb_detect_encoding()'s strict mode
+      $src_encoding = mb_detect_encoding($value, mb_detect_order(), true);
+      if ($src_encoding != "UTF-8") {
+        if (function_exists("mb_convert_encoding") && $src_encoding) {
+          $value = mb_convert_encoding($value, "UTF-8", $src_encoding);
+        } else {
+          $value = utf8_encode($value);
+        }
+      }
     }
     return $value;
   }
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index acb11bfb..39c87fbd 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -170,23 +170,37 @@ class graphics_Core {
 
         foreach (self::_get_rules($target) as $rule) {
           $args = array($working_file, $output_file, unserialize($rule->args), $item);
-          call_user_func_array($rule->operation, $args);
-          $working_file = $output_file;
+          try {
+            call_user_func_array($rule->operation, $args);
+            $working_file = $output_file;
+          } catch (Exception $e) {
+            // Ignore this rule and move on.
+            Kohana_Log::add("error", "Caught exception processing image: {$item->title}\n" .
+                            $e->getMessage() . "\n" . $e->getTraceAsString());
+          }
         }
       }
 
       if (!empty($ops["thumb"])) {
+        if (file_exists($item->thumb_path())) {
+          $item->thumb_dirty = 0;
+        } else {
+          copy(MODPATH . "gallery/images/missing_photo.png", $item->thumb_path());
+        }
         $dims = getimagesize($item->thumb_path());
         $item->thumb_width = $dims[0];
         $item->thumb_height = $dims[1];
-        $item->thumb_dirty = 0;
       }
 
       if (!empty($ops["resize"]))  {
+        if (file_exists($item->resize_path())) {
+          $item->resize_dirty = 0;
+        } else {
+          copy(MODPATH . "gallery/images/missing_photo.png", $item->resize_path());
+        }
         $dims = getimagesize($item->resize_path());
         $item->resize_width = $dims[0];
         $item->resize_height = $dims[1];
-        $item->resize_dirty = 0;
       }
       $item->save();
     } catch (Exception $e) {