wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

$this->notice is never unset after prepare

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-01-13 21:34:15 +01:00
parent adba38ce20
commit 1e5770bbcf
1 changed files with 24 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
actions/apistatusesshow.php
View File

@ -133,7 +133,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
*/ */
function showNotice() function showNotice()
{ {
if (!empty($this->notice)) {
switch ($this->format) { switch ($this->format) {
case 'xml': case 'xml':
$this->showSingleXmlStatus($this->notice); $this->showSingleXmlStatus($this->notice);
@ -149,28 +148,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
// TRANS: %s is the requested output format. // TRANS: %s is the requested output format.
throw new Exception(sprintf(_("Unsupported format: %s."), $this->format)); throw new Exception(sprintf(_("Unsupported format: %s."), $this->format));
} }
} else {
// XXX: Twitter just sets a 404 header and doens't bother
// to return an err msg
$deleted = Deleted_notice::getKV($this->notice_id);
if (!empty($deleted)) {
$this->clientError(
// TRANS: Client error displayed requesting a deleted status.
_('Status deleted.'),
410,
$this->format
);
} else {
$this->clientError(
// TRANS: Client error displayed requesting a status with an invalid ID.
_('No status with that ID found.'),
404,
$this->format
);
}
}
} }
/** /**
@ -193,13 +170,9 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
*/ */
function lastModified() function lastModified()
{ {
if (!empty($this->notice)) {
return strtotime($this->notice->created); return strtotime($this->notice->created);
} }
return null;
}
/** /**
* An entity tag for this notice * An entity tag for this notice
* *
@ -210,8 +183,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
*/ */
function etag() function etag()
{ {
if (!empty($this->notice)) {
return '"' . implode( return '"' . implode(
':', ':',
array($this->arg('action'), array($this->arg('action'),
@ -223,9 +194,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
. '"'; . '"';
} }
return null;
}
function deleteNotice() function deleteNotice()
{ {
if ($this->format != 'atom') { if ($this->format != 'atom') {