From a62e1aaf9d4cf8dfe66e21e8f642fc1b93abc460 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sat, 11 Aug 2012 18:09:03 +0200
Subject: the HTTP header Cache-Control must contain "public" in order to allow
 caching of resources when HTTPS is used

---
 modules/gallery/controllers/combined.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
index cd84cb42..80ae1e2d 100644
--- a/modules/gallery/controllers/combined.php
+++ b/modules/gallery/controllers/combined.php
@@ -50,7 +50,7 @@ class Combined_Controller extends Controller {
     if ($input->server("HTTP_IF_MODIFIED_SINCE")) {
       header('HTTP/1.0 304 Not Modified');
       header("Expires: Tue, 19 Jan 2038 00:00:00 GMT");
-      header("Cache-Control: max-age=2678400");
+      header("Cache-Control: public,max-age=2678400");
       header('Pragma: public');
       Kohana::close_buffers(false);
       return "";
@@ -83,7 +83,7 @@ class Combined_Controller extends Controller {
       header("Content-Type: text/css; charset=UTF-8");
     }
     header("Expires: Tue, 19 Jan 2038 00:00:00 GMT");
-    header("Cache-Control: max-age=2678400");
+    header("Cache-Control: public,max-age=2678400");
     header("Pragma: public");
     header("Last-Modified: " . gmdate("D, d M Y H:i:s T", time()));
     header("Content-Length: " . strlen($content));
-- 
cgit v1.2.3


From 71a67ebb9f685c4f7347c9a9744e3267bd2aa4f9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 28 Sep 2012 11:44:46 -0700
Subject: Add locale for Thai.  Fixes #1916.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index 0b1e16d3..f4837e01 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -110,6 +110,7 @@ class locales_Core {
     $l["sl_SI"] = "Slovenščina";              // Slovenian
     $l["sr_CS"] = "Srpski";                   // Serbian
     $l["sv_SE"] = "Svenska";                  // Swedish
+    $l["th_TH"] = "ภาษาไทย";                     // Thai
     $l["tn_ZA"] = "Setswana";                 // Setswana
     $l["tr_TR"] = "Türkçe";                   // Turkish
     $l["uk_UA"] = "українська";         // Ukrainian
-- 
cgit v1.2.3


From d8dce1e3e5bd6ed3976222fed2063b96f0569bc9 Mon Sep 17 00:00:00 2001
From: epeay <elliottp@inmotionhosting.com>
Date: Mon, 8 Oct 2012 16:41:02 -0400
Subject: Updated Select Photos button hitbox to cover full visible button
 area.

---
 modules/gallery/css/gallery.css               | 1 +
 modules/gallery/views/form_uploadify.html.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
index ecf89565..9d773699 100644
--- a/modules/gallery/css/gallery.css
+++ b/modules/gallery/css/gallery.css
@@ -39,6 +39,7 @@
 
 #g-add-photos-canvas object {
   z-index: 100;
+  padding: 0em;
 }
 
 #g-add-photos-canvas .uploadifyQueue {
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 22332e82..c1f985c3 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -23,8 +23,8 @@
 
     if (swfobject.hasFlashPlayerVersion("<?= $flash_minimum_version ?>")) {
       $("#g-uploadify").uploadify({
-        width: 150,
-        height: 33,
+        width: 298,
+        height: 32,
         uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>",
         script: "<?= url::site("uploader/add_photo/{$album->id}") ?>",
         scriptData: <?= json_encode($script_data) ?>,
-- 
cgit v1.2.3