forked from GNUsocial/gnu-social
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
This commit is contained in:
commit
a6c56d17e0
@ -78,8 +78,6 @@ class TwitapistatusesAction extends TwitterapiAction
|
||||
$this->auth_user = $apidata['user'];
|
||||
$user = $this->get_user($apidata['api_arg'], $apidata);
|
||||
|
||||
common_debug("auth user = " . $this->auth_user->nickname);
|
||||
|
||||
if (empty($user)) {
|
||||
$this->clientError(_('No such user!'), 404,
|
||||
$apidata['content-type']);
|
||||
|
@ -249,10 +249,13 @@ class Attachment extends AttachmentListItem
|
||||
$this->out->elementStart('div', 'entry-title');
|
||||
$this->out->elementStart('a', $this->linkAttr());
|
||||
$this->out->element('span', null, $this->linkTitle());
|
||||
$this->showRepresentation();
|
||||
$this->out->elementEnd('a');
|
||||
$this->out->elementEnd('div');
|
||||
|
||||
$this->out->elementStart('div', 'entry-content');
|
||||
$this->showRepresentation();
|
||||
$this->out->elementEnd('div');
|
||||
|
||||
if (!empty($this->oembed->author_name) || !empty($this->oembed->provider)) {
|
||||
$this->out->elementStart('div', array('id' => 'oembed_info',
|
||||
'class' => 'entry-content'));
|
||||
|
Loading…
Reference in New Issue
Block a user