diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-02-16 11:48:34 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-02-16 11:48:34 -0200 |
| commit | b6ee1b93376d42f8a8fcee0127bc10f84d1e018e (patch) | |
| tree | cbde5e4d0b745c3bb854c215bccea8b2d6bb367e /views/rss/group/default.php | |
| parent | 694306cf537fb8cb45beb7d4fd63c5b56cb5c4da (diff) | |
| parent | 5aff5b3913fbb6226d8fb3162453c58888fba38d (diff) | |
| download | elgg-b6ee1b93376d42f8a8fcee0127bc10f84d1e018e.tar.gz elgg-b6ee1b93376d42f8a8fcee0127bc10f84d1e018e.tar.bz2 | |
Merge branch 'master' into saravea
Diffstat (limited to 'views/rss/group/default.php')
| -rw-r--r-- | views/rss/group/default.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/rss/group/default.php b/views/rss/group/default.php index f57c7f82c..7fef4d434 100644 --- a/views/rss/group/default.php +++ b/views/rss/group/default.php @@ -11,9 +11,9 @@ $pubdate = date('r', $vars['entity']->getTimeCreated()); $title = htmlspecialchars($vars['entity']->name, ENT_NOQUOTES, 'UTF-8'); if ($vars['entity']->description) { - $description = autop($vars['entity']->description); + $description = elgg_autop($vars['entity']->description); } elseif ($vars['entity']->briefdescription) { - $description = autop($vars['entity']->briefdescription); + $description = elgg_autop($vars['entity']->briefdescription); } else { $description = ''; } |