diff options
| author | Sem <sembrestels@riseup.net> | 2014-01-22 03:37:52 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2014-01-22 03:37:52 +0100 |
| commit | 4a2ed114bb18c5363f594a380676c5654f4165a4 (patch) | |
| tree | 3a37094b249c40e3e6bf122691db53115f65f8f0 /views/default/object/elements | |
| parent | 673932bc46a3918293a28c2c2fc622b3e5ff6bde (diff) | |
| parent | 0dd36c458d41e77521c36ae572fe73114ad4bc5a (diff) | |
| download | elgg-4a2ed114bb18c5363f594a380676c5654f4165a4.tar.gz elgg-4a2ed114bb18c5363f594a380676c5654f4165a4.tar.bz2 | |
Merge tag '1.8.18' of git://github.com/Elgg/Elgg into develop
1.8.18
Conflicts:
mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
Diffstat (limited to 'views/default/object/elements')
| -rw-r--r-- | views/default/object/elements/full.php | 4 | ||||
| -rw-r--r-- | views/default/object/elements/summary.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/views/default/object/elements/full.php b/views/default/object/elements/full.php index 9b89f9706..b4634fe7e 100644 --- a/views/default/object/elements/full.php +++ b/views/default/object/elements/full.php @@ -22,9 +22,9 @@ $summary = elgg_extract('summary', $vars); $body = elgg_extract('body', $vars); $class = elgg_extract('class', $vars); if ($class) { - $class = "elgg-content $class"; + $class = "elgg-content clearfix $class"; } else { - $class = "elgg-content"; + $class = "elgg-content clearfix"; } $header = elgg_view_image_block($icon, $summary); diff --git a/views/default/object/elements/summary.php b/views/default/object/elements/summary.php index c0f3ad340..63ab8f816 100644 --- a/views/default/object/elements/summary.php +++ b/views/default/object/elements/summary.php @@ -27,7 +27,7 @@ if ($title_link === '') { $text = $entity->name; } $params = array( - 'text' => $text, + 'text' => elgg_get_excerpt($text, 100), 'href' => $entity->getURL(), 'is_trusted' => true, ); |