From b50d7f0d69122e15a91b9838eedeeb5c922040bb Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Tue, 1 Sep 2009 11:11:22 -0700
Subject: Fix bug #522 - Handle "save settings" correctly in the "share
 translations" form.

---
 modules/gallery/controllers/admin_languages.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index 894daedb..d91e5205 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -61,7 +61,7 @@ class Admin_Languages_Controller extends Admin_Controller {
       return $this->index($form);
     }
 
-    if ($form->sharing->share) {
+    if ($this->input->post("share")) {
       l10n_client::submit_translations();
       message::success(t("Translations submitted"));
     } else {
-- 
cgit v1.2.3


From 95ea310aff41f7c16b0a48ec35a5f47c32a4d801 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Tue, 1 Sep 2009 14:39:08 -0700
Subject: Remove unused l10n message

---
 modules/gallery/views/l10n_client.html.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index 3a43f7d3..b0f424be 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -74,7 +74,6 @@
   </div>
   <script type="text/javascript">
     var MSG_TRANSLATE_TEXT = <?= t("Translate Text")->for_js() ?>;
-    var MSG_CLOSE_X = <?= t("X")->for_js() ?>;
     var l10n_client_data = <?= json_encode($string_list) ?>;
     var plural_forms = <?= json_encode($plural_forms) ?>;
     var toggle_l10n_mode_url = <?= html::js_string(url::site("l10n_client/toggle_l10n_mode")) ?>;
-- 
cgit v1.2.3


From b14b9e0d7b22945f4934ff6fac8f89dae119cb8f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 1 Sep 2009 20:23:44 -0700
Subject: Allow anything to be made an album cover, except for direct children
 of the root album (which has no visible album cover, so no point in offering
 that option).  This fully resolves #705.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index adfc7fd2..f72ef982 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -268,7 +268,7 @@ class gallery_Core {
         } else {
           $disabledState = " ";
         }
-        if ($item->is_photo()) {
+        if ($item->parent()->id != 1) {
           $options_menu
             ->append(Menu::factory("ajax_link")
                      ->id("make_album_cover")
-- 
cgit v1.2.3


From ecc0d89cd4c7e8f0b0ba42588d3ee24062fdb1d2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 1 Sep 2009 20:34:19 -0700
Subject: Fix up incorrectly applied html::mark_clean().  Resolves #698, thanks
 fperwth!

---
 modules/gallery/views/permissions_browse.html.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index b9af9117..99a1b7bd 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -29,7 +29,8 @@
   <ul id="gMessage">
     <li class="gError">
       <?= t("Oh no!  Your server needs a configuration change in order for you to hide photos!  Ask your server administrator to enable <a %mod_rewrite_attrs>mod_rewrite</a> and set <a %apache_attrs><i>AllowOverride FileInfo Options</i></a> to fix this.",
-            array("mod_rewrite_attrs" => html::mark_clean("href=\"http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html\" target=\"_blank\"", "apache_attrs" => "href=\"http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride\" target=\"_blank\""))) ?>
+            array("mod_rewrite_attrs" => html::mark_clean('href="http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html" target="_blank"'),
+                  "apache_attrs" => html::mark_clean('href="http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride" target="_blank"'))) ?>
     </li>
   </ul>
   <? endif ?>
@@ -54,4 +55,4 @@
   <div id="gEditPermissionForm">
     <?= $form ?>
   </div>
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3