[geeklog-hg] geeklog: Fix for changeset 01dd2e6c3877

[geeklog-cvs at lists.geeklog.net]

changeset 9553:c0d204570b46
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c0d204570b46
user: dengen <taharaxp at gmail.com>
date: Tue Nov 11 20:06:23 2014 +0900
description:
Fix for changeset 01dd2e6c3877

diffstat:

 system/classes/config.class.php |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r 01dd2e6c3877 -r c0d204570b46 system/classes/config.class.php
--- a/system/classes/config.class.php	Mon Nov 10 00:38:37 2014 +0900
+++ b/system/classes/config.class.php	Tue Nov 11 20:06:23 2014 +0900
@@ -240,7 +240,7 @@
         }
 
         // Now figure out other info since tabs are now specified
-        $sql = "SELECT name, value, group_name, type, subgroup, tab FROM {$_TABLES['conf_values']} WHERE type <> 'tab' AND type <> 'hidden'";
+        $sql = "SELECT name, value, group_name, type, subgroup, tab FROM {$_TABLES['conf_values']} WHERE type <> 'tab'";
         $result = DB_query($sql);
         $false_str = serialize(false);
         while ($row = DB_fetchArray($result)) {
@@ -1993,8 +1993,9 @@
                                 if (array_key_exists($conf, $LANG_fs[$group])) {
                                     $label = $LANG_fs[$group][$conf];
                                 } else {
-                                    // No label found, set name
-                                    $label = $conf;
+                                    // No label found
+                                    // Maybe config value type is hidden, so skip
+                                    continue;
                                 }
                             }