We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 3b1c5e5a authored by Zach Copley's avatar Zach Copley

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline:
  Fix blog plugin error to allow deleting a blog post
  correctly show the blog content for blog entries
parents f955cf6a eef89c67
......@@ -194,7 +194,7 @@ class BlogPlugin extends MicroAppPlugin
{
if ($notice->object_type == Blog_entry::TYPE) {
$entry = Blog_entry::fromNotice($notice);
if (exists($entry)) {
if (!empty($entry)) {
$entry->delete();
}
}
......
......@@ -71,15 +71,31 @@ class BlogEntryListItem extends NoticeListItemAdapter
$out->element('a', array('href' => $notice->bestUrl()), $entry->title);
$out->elementEnd('h4');
if (!empty($entry->summary)) {
$out->elementStart('div', 'blog-entry-summary');
$out->raw($entry->summary);
$out->elementEnd('div');
} else {
// XXX: hide content initially; click More... for full text.
// XXX: kind of a hack
$actionName = $out->trimmed('action');
if ($actionName == 'shownotice' ||
$actionName == 'showblogentry' ||
$actionName == 'conversation') {
$out->elementStart('div', 'blog-entry-content');
$out->raw($entry->content);
$out->elementEnd('div');
} else {
if (!empty($entry->summary)) {
$out->elementStart('div', 'blog-entry-summary');
$out->raw($entry->summary);
$out->elementEnd('div');
}
$url = ($entry->url) ? $entry->url : $notice->bestUrl();
$out->element('a',
array('href' => $url,
'class' => 'blog-entry-link'),
_('More...'));
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment