mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
* Mail: Fix links get removed from description content of calendar appointment email
This commit is contained in:
parent
f8adc0cadf
commit
8340520589
@ -1116,7 +1116,7 @@ class calendar_uiforms extends calendar_ui
|
||||
if(!is_array($event['link_to'])) $event['link_to'] = array();
|
||||
$event['link_to']['to_app'] = 'calendar';
|
||||
$event['link_to']['to_id'] = 0;
|
||||
|
||||
|
||||
foreach(Link::get_links($event['link_to']['to_app'], $event['id']) as $link)
|
||||
{
|
||||
if(!$link['id']) continue;
|
||||
@ -1936,6 +1936,13 @@ class calendar_uiforms extends calendar_ui
|
||||
}
|
||||
$event = array_shift($events);
|
||||
|
||||
/* Encode html specialchars (eg. < to <) because client-side core
|
||||
* widget runs decoding for the value causes elimination of none
|
||||
* encoded html chars. This will help included links inside description
|
||||
* get displayed if activate_links = ture for description widget is set.
|
||||
*/
|
||||
if ($event['description'] != '') $event['description'] = htmlspecialchars($event['description']);
|
||||
|
||||
// convert event from servertime returned by calendar_ical to user-time
|
||||
$this->bo->server2usertime($event);
|
||||
|
||||
|
@ -71,7 +71,7 @@
|
||||
</row>
|
||||
<row class="row" valign="top">
|
||||
<description value="Description"/>
|
||||
<description id="description" no_lang="1"/>
|
||||
<description id="description" no_lang="ture" activate_links="true"/>
|
||||
</row>
|
||||
<row class="row" valign="top">
|
||||
<description value="Participants"/>
|
||||
|
Loading…
Reference in New Issue
Block a user