diff options
| author | \oXoXo/ <hellekin@cepheide.org> | 2013-02-02 08:35:32 -0800 |
|---|---|---|
| committer | \oXoXo/ <hellekin@cepheide.org> | 2013-02-02 08:35:32 -0800 |
| commit | b4806b8c7188708a6ca505aa54374f49f0da0f51 (patch) | |
| tree | 3e830a17d1ec7b80ed20860dff6ddd93514e26af /views | |
| parent | 39bca929f875ca6e9bd422b112d1e48b717fa126 (diff) | |
| parent | 378ab3658316e8b400990ed5c7a1b2b17750b81b (diff) | |
| download | elgg-b4806b8c7188708a6ca505aa54374f49f0da0f51.tar.gz elgg-b4806b8c7188708a6ca505aa54374f49f0da0f51.tar.bz2 | |
Merge pull request #1 from tacid/master
RSS fix and Russian translation
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/object/event_calendar.php | 6 | ||||
| -rw-r--r-- | views/rss/object/event_calendar.php | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/views/default/object/event_calendar.php b/views/default/object/event_calendar.php index 5779c004c..17f7ff130 100644 --- a/views/default/object/event_calendar.php +++ b/views/default/object/event_calendar.php @@ -55,9 +55,9 @@ if ($full) { echo $list_body; echo $body; if ($event->long_description) { - echo '<p>'.$event->long_description.'</p>'; + echo '<div class="elgg-output">'.$event->long_description.'</div>'; } else { - echo '<p>'.$event->description.'</p>'; + echo '<div class="elgg-output">'.$event->description.'</div>'; } if ($vars['light_box'] == TRUE) { $event_calendar_add_users = elgg_get_plugin_setting('add_users', 'event_calendar'); @@ -112,4 +112,4 @@ if ($full) { echo elgg_view_image_block($icon, $list_body); } -?>
\ No newline at end of file +?> diff --git a/views/rss/object/event_calendar.php b/views/rss/object/event_calendar.php index 92f6fcc14..45b2d847a 100644 --- a/views/rss/object/event_calendar.php +++ b/views/rss/object/event_calendar.php @@ -11,6 +11,7 @@ * @link http://elgg.org/ */ + elgg_load_library('elgg:event_calendar'); $title = $vars['entity']->title; $event_items = event_calendar_get_formatted_full_items($vars['entity']); |