diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-15 11:26:08 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-15 11:26:08 +0000 |
| commit | e4618033ced417680e5dba7d247acaf800ac0698 (patch) | |
| tree | d07c61171393f945bcf3e63d3518a8fa7d89344e | |
| parent | f84e8a5e4f853fe12b8bd42c7fb99f56eb3f7dad (diff) | |
| download | zabbix-e4618033ced417680e5dba7d247acaf800ac0698.tar.gz zabbix-e4618033ced417680e5dba7d247acaf800ac0698.tar.xz zabbix-e4618033ced417680e5dba7d247acaf800ac0698.zip | |
- fixed displaying of text data (EOL) in screens (Alexei)
[svn merge -r4577:4580 svn://svn.zabbix.com/branches/1.4.2]
git-svn-id: svn://svn.zabbix.com/trunk@4581 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | frontends/php/include/config.inc.php | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -13,6 +13,7 @@ Changes for 1.5: Changes for 1.4.2: + - fixed displaying of text data (EOL) in screens (Alexei) - added missing { and } when displaying trigger expressions (Alexei) - fixed processing of negative SNMP integers (Alexei) - fixed processing of MM in format of log timestamps (Alexei) diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 46472344..d0337da0 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -960,7 +960,7 @@ function TODO($msg) { echo "TODO: ".$msg.BR; } // DEBUG INFO!!! } /* do not use break */ case ITEM_VALUE_TYPE_STR: - $value = nbsp(htmlspecialchars($row["value"])); + $value = nl2br(nbsp(htmlspecialchars($row["value"]))); break; default: |