From fc5d1e5d74124de0dd8de361fe08e83653f960a2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 27 Dec 2009 12:41:52 -0800
Subject: Fix a bug where we weren't replacing table names when there's no
 prefix.  This is wrong because even when there's no prefix we have to get rid
 of the {curly} braces.

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

(limited to 'modules/gallery')

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);
-- 
cgit v1.2.3


From 754c531c7ec77278e44669ee5a854dd4653120f8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 27 Dec 2009 13:37:39 -0800
Subject: Only mark a variable as empty if its value is null.  So 0 shows as 0.

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

(limited to 'modules/gallery')

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>
-- 
cgit v1.2.3