Merge branch 'master' into talmdal_dev

5 files changed, 21 insertions, 6 deletions

diff --git a/modules/gallery/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
index de3e5a84..61f23fb0 100644
--- a/modules/gallery/libraries/MY_Database.php
+++ b/modules/gallery/libraries/MY_Database.php
@@ -39,7 +39,7 @@ abstract class Database extends Database_Core {
    * table prefix . $1
    */
   public function query($sql = '') {
-    if ($this->config["table_prefix"] && !empty($sql)) {
+    if (!empty($sql)) {
       $sql = $this->add_table_prefixes($sql);
     }
     return parent::query($sql);
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index ff4843ab..2d4b11a1 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -25,7 +25,7 @@
           <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . html::clean($var->name)) ?>"
             class="g-dialog-link"
             title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name))->for_html_attr() ?>">
-            <? if ($var->value): ?>
+            <? if (isset($var->value)): ?>
             <?= html::clean($var->value) ?>
             <? else: ?>
             <i> <?= t("empty") ?> </i>
diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php
index baf896fe..c4d7c56d 100644
--- a/modules/slideshow/helpers/slideshow_event.php
+++ b/modules/slideshow/helpers/slideshow_event.php
@@ -31,31 +31,34 @@ class slideshow_event_Core {
   }
 
   static function album_menu($menu, $theme) {
+    $max_scale = module::get_var("slideshow", "max_scale");
     if ($theme->item()->descendants_count(array(array("type", "=", "photo")))) {
       $menu->append(Menu::factory("link")
                     ->id("slideshow")
                     ->label(t("View slideshow"))
                     ->url("javascript:cooliris.embed.show(" .
-                          "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})")
+                          "{maxScale:$max_scale,feed:'" . self::_feed_url($theme) . "'})")
                     ->css_id("g-slideshow-link"));
     }
   }
 
   static function photo_menu($menu, $theme) {
+    $max_scale = module::get_var("slideshow", "max_scale");
     $menu->append(Menu::factory("link")
                   ->id("slideshow")
                   ->label(t("View slideshow"))
                   ->url("javascript:cooliris.embed.show(" .
-                        "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})")
+                        "{maxScale:$max_scale,feed:'" . self::_feed_url($theme) . "'})")
                   ->css_id("g-slideshow-link"));
   }
 
   static function tag_menu($menu, $theme) {
+    $max_scale = module::get_var("slideshow", "max_scale");
     $menu->append(Menu::factory("link")
                   ->id("slideshow")
                   ->label(t("View slideshow"))
                   ->url("javascript:cooliris.embed.show(" .
-                        "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})")
+                        "{maxScale:$max_scale,feed:'" . self::_feed_url($theme) . "'})")
                   ->css_id("g-slideshow-link"));
   }
 
diff --git a/modules/slideshow/helpers/slideshow_installer.php b/modules/slideshow/helpers/slideshow_installer.php
index 56874a6a..03f3332c 100644
--- a/modules/slideshow/helpers/slideshow_installer.php
+++ b/modules/slideshow/helpers/slideshow_installer.php
@@ -18,6 +18,18 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class slideshow_installer {
+  static function install() {
+    module::set_var("slideshow", "max_scale", 0);
+    module::set_version("slideshow", 2);
+  }
+
+  static function upgrade($version) {
+    if ($version == 1) {
+      module::set_var("slideshow", "max_scale", 0);
+      module::set_version("slideshow", $version = 2);
+    }
+  }
+
   static function deactivate() {
     site_status::clear("slideshow_needs_rss");
   }
diff --git a/modules/slideshow/module.info b/modules/slideshow/module.info
index 6841199a..b56eac81 100644
--- a/modules/slideshow/module.info
+++ b/modules/slideshow/module.info
@@ -1,3 +1,3 @@
 name = "Slideshow"
 description = "Allows users to view a slideshow of photos"
-version = 1
+version = 2