Revision: 1716
http://mrbs.svn.sourceforge.net/mrbs/?rev=1716&view=rev
Author: cimorrison
Date: 2010-12-20 10:45:29 +0000 (Mon, 20 Dec 2010)
Log Message:
-----------
Fixed bug causing HTML tags to get into the plain text description of an
iCalendar event
Modified Paths:
--------------
mrbs/branches/ics_attachments/web/view_entry.php
Modified: mrbs/branches/ics_attachments/web/view_entry.php
===================================================================
--- mrbs/branches/ics_attachments/web/view_entry.php 2010-12-19 17:11:22 UTC
(rev 1715)
+++ mrbs/branches/ics_attachments/web/view_entry.php 2010-12-20 10:45:29 UTC
(rev 1716)
@@ -122,7 +122,7 @@
global $keep_private, $room_disabled, $area_disabled;
$tbody = '';
- $tbody .= "<tbody>\n";
+ $tbody .= ($as_html) ? "<tbody>\n" : "";
// Description
$class = ($keep_private & $is_private_field['entry.description']) ?
"private" : "";
$tbody .= create_details_row(get_vocab("description"), $data['description'],
$as_html, $class);
@@ -142,7 +142,9 @@
$value = $data['area_name'] . " - " . $data['room_name'];
if ($room_disabled || $area_disabled)
{
- $value .= "<span class=\"note\"> (" . get_vocab("disabled") . ")</span>";
+ $value .= ($as_html) ? "<span class=\"note\">" : "";
+ $value .= " (" . get_vocab("disabled") . ")";
+ $value .= ($as_html) ? "</span>" : "";
}
$tbody .= create_details_row(get_vocab("room"), $value, $as_html);
// Start date
@@ -224,7 +226,7 @@
// Repeat end date
$tbody .= create_details_row(get_vocab("rep_end_date"), utf8_strftime('%A
%d %B %Y',$data['end_date']), $as_html);
}
- $tbody .= "</tbody>\n";
+ $tbody .= ($as_html) ? "</tbody>\n" : "";
return $tbody;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits