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

updating prepare and handle

This commit is contained in:
Mikael Nordfeldth 2014-01-01 20:30:30 +01:00
parent 4ab56f34dd
commit 915d329b5a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actions/shownotice.php
View File

@ -70,7 +70,7 @@ class ShownoticeAction extends Action
* *
* @return success flag * @return success flag
*/ */
function prepare($args) protected function prepare(array $args=array())
{ {
parent::prepare($args); parent::prepare($args);
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {
@ -117,16 +117,16 @@ class ShownoticeAction extends Action
* *
* @return Notice * @return Notice
*/ */
function getNotice() protected function getNotice()
{ {
$id = $this->arg('notice'); $id = $this->arg('notice');
$notice = Notice::getKV('id', $id); $notice = Notice::getKV('id', $id);
if (empty($notice)) { if (!$notice instanceof Notice) {
// Did we used to have it, and it got deleted? // Did we used to have it, and it got deleted?
$deleted = Deleted_notice::getKV($id); $deleted = Deleted_notice::getKV($id);
if (!empty($deleted)) { if ($deleted instanceof Deleted_notice) {
// TRANS: Client error displayed trying to show a deleted notice. // TRANS: Client error displayed trying to show a deleted notice.
$this->clientError(_('Notice deleted.'), 410); $this->clientError(_('Notice deleted.'), 410);
} else { } else {
@ -211,9 +211,9 @@ class ShownoticeAction extends Action
* *
* @return void * @return void
*/ */
function handle($args) protected function handle()
{ {
parent::handle($args); parent::handle();
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {
$this->showAjax(); $this->showAjax();