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

8 files changed, 115 insertions, 17 deletions

diff --git a/.build_number b/.build_number
index 737f78aa..79e7274f 100644
--- a/.build_number
+++ b/.build_number
@@ -3,4 +3,4 @@
 ; process.  You don't need to edit it.  In fact..
 ;
 ;     DO NOT EDIT THIS FILE BY HAND!
-build_number=157
+build_number=162
diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 90984e84..1252014f 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -34,7 +34,7 @@ class G2_Controller extends Controller {
     $path = $input->get("path");
     $id = $input->get("g2_itemId");
 
-    if ($path || $id) {
+    if (($path && $path != 'index.php' && $path != 'main.php') || $id) {
       if ($id) {
         // Requests by id are either core.DownloadItem or core.ShowItem requests. Later versions of
         // Gallery 2 don't specify g2_view if it's the default (core.ShowItem). And in some cases
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) {
diff --git a/modules/gallery/images/missing_photo.png b/modules/gallery/images/missing_photo.png
new file mode 100644
index 00000000..67786275
--- /dev/null
+++ b/modules/gallery/images/missing_photo.png
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index 7d947b28..9d53779f 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -48,7 +48,7 @@
 
         <? if (!$count): ?>
         <p>
-          <?= t("There are no other site themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Modules")) ?>
+          <?= t("There are no other site themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Themes")) ?>
         </p>
         <? endif ?>
       </div>
@@ -88,7 +88,7 @@
 
         <? if (!$count): ?>
         <p>
-          <?= t("There are no other admin themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Modules")) ?>
+          <?= t("There are no other admin themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Themes")) ?>
         </p>
         <? endif ?>
       </div>
diff --git a/themes/admin_wind/css/screen-rtl.css b/themes/admin_wind/css/screen-rtl.css
index 0809c1b5..79afabb3 100644
--- a/themes/admin_wind/css/screen-rtl.css
+++ b/themes/admin_wind/css/screen-rtl.css
@@ -92,7 +92,11 @@ input[type=radio] {
   padding-right: 0;
 }
 
-input.checkbox {
+input.checkbox,
+input[type="checkbox"],
+input.radio,
+input[type="radio"] {
+  margin-right: 0;
   margin-left: .4em;
 }
 
@@ -109,6 +113,14 @@ input.checkbox {
   margin-right: .2em;
 }
 
+.g-group h4 {
+  padding: .5em .5em .5em 0;
+}
+
+.g-group .g-user {
+  padding: .2em .5em 0 0;
+}
+
 /* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-buttonset .ui-corner-tl {
@@ -275,6 +287,10 @@ ul.sf-menu li li li.sfHover ul {
   right: auto;
 }
 
+.ui-tabs .ui-tabs-nav li {
+  float: right;	
+}
+
 #g-content #g-album-grid .g-item,
 #g-site-theme,
 #g-admin-theme,
@@ -286,6 +302,11 @@ li.g-group,
   float: right;
 }
 
+#g-site-theme {
+  margin-right: 0;
+  margin-left: 1em;
+}
+
 #g-admin-graphics .g-available .g-block {
   float: right;
   margin-left: 1em;
@@ -316,3 +337,64 @@ li.g-group,
 .g-available .g-block img {
   margin: 0 0 1em 1em;
 }
+
+.g-button {
+  margin: 0 0 0 4px;
+}
+
+/* RTL paginator ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-paginator .g-info {
+  width: 35%;
+}
+
+.g-paginator .g-text-right {
+  margin-left: 0;
+}
+
+.g-paginator .ui-icon-seek-end {
+  background-position: -80px -160px;
+}
+
+.g-paginator .ui-icon-seek-next {
+  background-position: -48px -160px;
+}
+
+.g-paginator .ui-icon-seek-prev {
+  background-position: -32px -160px;
+}
+
+.g-paginator .ui-icon-seek-first {
+  background-position: -64px -160px;
+}
+
+#g-header #g-login-menu,
+#g-header #g-quick-search-form {
+  clear: left;
+  float: left;
+}
+
+#g-header #g-login-menu li {
+  margin-left: 0;
+  padding-left: 0;
+  padding-right: 1.2em;
+}
+
+#g-site-menu {
+  left: auto;
+  right: 240px;
+}
+
+#g-view-menu #g-slideshow-link {
+  background-image: url('../images/ico-view-slideshow-rtl.png');
+}
+
+#g-sidebar .g-block-content {
+  padding-right: 1em;
+  padding-left: 0;
+}
+
+#g-footer #g-credits li {
+  padding-left: 1.2em !important;
+  padding-right: 0;
+}
diff --git a/themes/wind/css/screen-rtl.css b/themes/wind/css/screen-rtl.css
index 914a19dd..e79f2c06 100644
--- a/themes/wind/css/screen-rtl.css
+++ b/themes/wind/css/screen-rtl.css
@@ -275,7 +275,6 @@ ul.sf-menu li li li.sfHover ul {
   right: auto;
 }
 
-
 /* RTL paginator ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-paginator .g-info {