Fixed multiline package property value display.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index dccd327201e606d14ea7f2f9e9b1e617b5a49da6..16b519aac7c343b73d03ce2593beff31c80473a6 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -39,6 +39,8 @@ $ /admin/inst_theme.php
 $ /includes/packages.inc
 + Added encoding display for chart packages list
 $ /install/index.php
+# Fixed multiline package property values display.
+$ /includes/ui/view_package.php
 
 06-Aug-2010 Joe Hunt
 # Bank Payment on customer statements shows in credit column, should be debit. Balance ok.

diff --git a/includes/ui/view_package.php b/includes/ui/view_package.php
index 9c8022cdd4e2411e8423f074d1f3f0c46570e30e..aa2c9df5309c40c6a8175c032085c69646a316ef 100644 (file)
--- a/includes/ui/view_package.php
+++ b/includes/ui/view_package.php
@@ -41,7 +41,7 @@ foreach ($pkg as $field => $value) {
        if ($value == '')
                continue;
        start_row();
-       label_cells($field, htmlentities(is_array($value) ? implode('<br>', $value) :$value),
+       label_cells($field, nl2br(htmlentities(is_array($value) ? implode("\n", $value) :$value)),
                 "class='tableheader2'");
        end_row();
 }