Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

This commit is contained in:
Brion Vibber 2010-02-24 01:10:58 +00:00
commit 868ae8e62b
1 changed files with 5 additions and 4 deletions

View File

@ -438,14 +438,15 @@ class NoticeListItem extends Widget
$this->out->text(_('at')); $this->out->text(_('at'));
$this->out->text(' '); $this->out->text(' ');
if (empty($url)) { if (empty($url)) {
$this->out->element('span', array('class' => 'geo', $this->out->element('abbr', array('class' => 'geo',
'title' => $latlon), 'title' => $latlon),
$name); $name);
} else { } else {
$this->out->element('a', array('class' => 'geo', $this->out->elementStart('a', array('href' => $url));
'title' => $latlon, $this->out->element('abbr', array('class' => 'geo',
'href' => $url), 'title' => $latlon),
$name); $name);
$this->out->elementEnd('a');
} }
$this->out->elementEnd('span'); $this->out->elementEnd('span');
} }