From: Brion Vibber Date: Fri, 8 Oct 2010 17:33:43 +0000 (-0700) Subject: Fix PHP fatal error in DeletenoticeAction: died when we had a valid notice, but weren... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f62e7c461f2fb4fcdc91b125072be953fc09fbe2;p=quix0rs-gnu-social.git Fix PHP fatal error in DeletenoticeAction: died when we had a valid notice, but weren't logged in due to accessing $this->user before the login check. Moved check up to prepare() from handle() so it's done before usage --- diff --git a/actions/deletenotice.php b/actions/deletenotice.php index 68c43040b0..2879faa5df 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -45,6 +45,12 @@ class DeletenoticeAction extends Action parent::prepare($args); $this->user = common_current_user(); + + if (!$this->user) { + common_user_error(_('Not logged in.')); + exit; + } + $notice_id = $this->trimmed('notice'); $this->notice = Notice::staticGet($notice_id); @@ -63,10 +69,7 @@ class DeletenoticeAction extends Action { parent::handle($args); - if (!common_logged_in()) { - common_user_error(_('Not logged in.')); - exit; - } else if ($this->notice->profile_id != $this->user_profile->id && + if ($this->notice->profile_id != $this->user_profile->id && !$this->user->hasRight(Right::DELETEOTHERSNOTICE)) { common_user_error(_('Can\'t delete this notice.')); exit;