summaryrefslogtreecommitdiffstats
path: root/apps/calendar
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-07-03 16:39:09 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-07-03 16:39:09 +0200
commit0b3ed2b048df99686bd6e0edebfb51f8ac5bf08e (patch)
treef1d69d441ae98cfe06d2ac3b38b1748691fe1284 /apps/calendar
parentcfcfdd674ef060fe8d91a0ff56233b1077483050 (diff)
parentca2b1f78630257ff4a2beadb5e25d628e5195bb0 (diff)
downloadnextcloud-server-0b3ed2b048df99686bd6e0edebfb51f8ac5bf08e.tar.gz
nextcloud-server-0b3ed2b048df99686bd6e0edebfb51f8ac5bf08e.zip
Merge branch 'master' into calendar_import
Diffstat (limited to 'apps/calendar')
-rw-r--r--apps/calendar/js/calendar.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index aaf168844ea..f7a4c961774 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -867,7 +867,7 @@ $(document).ready(function(){
eventDrop: Calendar.UI.moveEvent,
eventResize: Calendar.UI.resizeEvent,
eventRender: function(event, element) {
- element.find('.fc-event-title').html(element.find('.fc-event-title').html());
+ element.find('.fc-event-title').html(element.find('.fc-event-title').text());
element.tipsy({
className: 'tipsy-event',
opacity: 0.9,