GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x' into mapstraction

This commit is contained in:
Evan Prodromou 2009-11-19 11:30:35 -05:00
parent 844a28aa9d c721884b52
commit 7e8ce8fe8d
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/noticelist.php
View File

@ -199,8 +199,8 @@ class NoticeListItem extends Widget
{
$this->out->elementStart('div', 'entry-content');
$this->showNoticeLink();
$this->showNoticeLocation();
$this->showNoticeSource();
$this->showNoticeLocation();
$this->showContext();
$this->out->elementEnd('div');
}
@ -399,13 +399,18 @@ class NoticeListItem extends Widget
$url = $location->getUrl();
// TODO: Output @title lat and lon on element @class geo
// e.g., class="geo" title="45.5088375;-73.587809"
$this->out->elementStart('span', array('class' => 'location'));
$this->out->text(_('at'));
if (empty($url)) {
$this->out->element('span', array('class' => 'location'), $name);
$this->out->element('span', array('class' => 'geo'), $name);
} else {
$this->out->element('a', array('class' => 'location',
$this->out->element('a', array('class' => 'geo',
'href' => $url),
$name);
}
$this->out->elementEnd('span');
}
/**

2
plugins/LinkbackPlugin.php
View File

@ -59,7 +59,7 @@ class LinkbackPlugin extends Plugin
parent::__construct();
}
function onEndNoticeSave($notice)
function onHandleQueuedNotice($notice)
{
if ($notice->is_local == 1) {
// Try to avoid actually mucking with the

2
plugins/Realtime/RealtimePlugin.php
View File

@ -125,7 +125,7 @@ class RealtimePlugin extends Plugin
return true;
}
function onEndNoticeSave($notice)
function onHandleQueuedNotice($notice)
{
$paths = array();