[20794] fix: proper handling of return characters in description fields => <br/> in html display
Pascal Vilarem <[email protected]>
| Newsgroups | gmane.comp.web.phpgroupware.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 20794
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20794
Author: maat
Date: 2009-11-17 18:17:08 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
fix: proper handling of return characters in description fields => <br/> in html display
Modified Paths:
--------------
modules/ged/trunk/inc/class.ged_ui.inc.php
Modified: modules/ged/trunk/inc/class.ged_ui.inc.php
===================================================================
--- modules/ged/trunk/inc/class.ged_ui.inc.php 2009-11-17 18:07:14 UTC (rev 20793)
+++ modules/ged/trunk/inc/class.ged_ui.inc.php 2009-11-17 18:17:08 UTC (rev 20794)
@@ -691,7 +691,7 @@
$this->t->set_var('version', $version_info['major'].".".$version_info['minor'].".".$version_info['draft']);
$this->t->set_var('version_creation_date', $GLOBALS['phpgw']->common->show_date($version_info['creation_date']));
- $this->t->set_var('version_description', $version_info['description']);
+ $this->t->set_var('version_description', ereg_replace("\n","<BR/>",$version_info['description']));
$this->t->set_var('version_creator', $GLOBALS['phpgw']->common->grab_owner_name($version_info['creator_id']));
$this->t->set_var('version_status_value', $version_info['status']);
@@ -781,7 +781,7 @@
}
- $file_array_vars=Array('versions_numcol'=>$versions_numcol, 'owner'=>$GLOBALS['phpgw']->common->grab_owner_name($element_info['owner_id']), 'description'=>$element_info['description'], 'reference'=>$element_info['reference'], 'name'=>$element_info['name'], 'creation_date'=>$GLOBALS['phpgw']->common->show_date($element_info['creation_date']), 'current_version_date'=>$GLOBALS['phpgw']->common->show_date($current_version['creation_date']), 'current_version'=>$current_version['major'].".".$current_version['minor'].".".$current_version['draft'], 'current_version_description'=>$current_version['description'], 'current_version_creator'=>$GLOBALS['phpgw']->common->grab_owner_name($current_version['creator_id']), 'current_version_file_size'=>$current_version['size'], 'current_version_img_mime_ty
pe'=>$GLOBALS['phpgw']->common->image('ged', $this->icons[$extension]), 'current_version_expiration_date'=>$expiration_date, 'current_version_mime_type'=>$current_version['mime_type']);
+ $file_array_vars=Array('versions_numcol'=>$versions_numcol, 'owner'=>$GLOBALS['phpgw']->common->grab_owner_name($element_info['owner_id']), 'description'=>ereg_replace("\n","<BR/>",$element_info['description']), 'reference'=>$element_info['reference'], 'name'=>$element_info['name'], 'creation_date'=>$GLOBALS['phpgw']->common->show_date($element_info['creation_date']), 'current_version_date'=>$GLOBALS['phpgw']->common->show_date($current_version['creation_date']), 'current_version'=>$current_version['major'].".".$current_version['minor'].".".$current_version['draft'], 'current_version_description'=>ereg_replace("\n","<BR/>",$current_version['description']), 'current_version_creator'=>$GLOBALS['phpgw']->common->grab_owner_name($current_version['creator_id']), 'current_version_file_size'=>
$current_version['size'], 'current_version_img_mime_type'=>$GLOBALS['phpgw']->common->image('ged', $this->icons[$extension]), 'current_version_expiration_date'=>$expiration_date, 'current_version_mime_type'=>$current_version['mime_type']);
$this->t->set_var($file_array_vars);