Commit 1e5770bb authored by mmn's avatar mmn

$this->notice is never unset after prepare

parent adba38ce
......@@ -133,7 +133,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
*/
function showNotice()
{
if (!empty($this->notice)) {
switch ($this->format) {
case 'xml':
$this->showSingleXmlStatus($this->notice);
......@@ -149,28 +148,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
// TRANS: %s is the requested output 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()
{
if (!empty($this->notice)) {
return strtotime($this->notice->created);
}
return null;
}
/**
* An entity tag for this notice
*
......@@ -210,8 +183,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
*/
function etag()
{
if (!empty($this->notice)) {
return '"' . implode(
':',
array($this->arg('action'),
......@@ -223,9 +194,6 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
. '"';
}
return null;
}
function deleteNotice()
{
if ($this->format != 'atom') {
......
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