summaryrefslogtreecommitdiffstats
path: root/frontends/php/config.php
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-04-10 09:34:21 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-04-10 09:34:21 +0000
commitfcc91decd3db84a94505ac2147be987867dcfb41 (patch)
treeec0ba6b36bf92051aca7b5fbcc4e2d4e9a792c9b /frontends/php/config.php
parentd53a7572a565383d4680361388063acb0a864aaa (diff)
downloadzabbix-fcc91decd3db84a94505ac2147be987867dcfb41.tar.gz
zabbix-fcc91decd3db84a94505ac2147be987867dcfb41.tar.xz
zabbix-fcc91decd3db84a94505ac2147be987867dcfb41.zip
- merged rev. 5602:5604 of branches/1.4 (Artem) [fixed empty cells for IE]
- fixes permissions SQL for different DBs (Artem) git-svn-id: svn://svn.zabbix.com/trunk@5605 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/config.php')
-rw-r--r--frontends/php/config.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/frontends/php/config.php b/frontends/php/config.php
index b4b15306..c01fc4ed 100644
--- a/frontends/php/config.php
+++ b/frontends/php/config.php
@@ -404,8 +404,8 @@ include_once "include/page_header.php";
$mappings_row = array();
$db_maps = DBselect("select * from mappings".
" where valuemapid=".$db_valuemap["valuemapid"]);
- while($db_map = DBfetch($db_maps))
- {
+
+ while($db_map = DBfetch($db_maps)){
array_push($mappings_row,
$db_map["value"],
SPACE.RARR.SPACE,
@@ -416,7 +416,8 @@ include_once "include/page_header.php";
new CLink($db_valuemap["name"],"config.php?form=update&".
"valuemapid=".$db_valuemap["valuemapid"].url_param("config"),
"action"),
- $mappings_row));
+ empty($mappings_row)?SPACE:$mappings_row
+ ));
}
$table->Show();