Merge branch 'nightly' of gitorious.org:social/mainline into nightly

[quix0rs-gnu-social.git] / actions / deletenotice.php

diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index c997bb756a9010c058a491af91afbcfaf8b509ac..f278300838bb0e29267d43fa0bab2860cc92c22b 100644 (file)
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -41,20 +41,20 @@ class DeletenoticeAction extends Action
     var $profile      = null;
     var $user_profile = null;
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
         $this->user   = common_current_user();
 
         if (!$this->user) {
-            // TRANS: Error message displayed trying to delete a notice while not logged in.
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             common_user_error(_('Not logged in.'));
             exit;
         }
 
         $notice_id    = $this->trimmed('notice');
-        $this->notice = Notice::staticGet($notice_id);
+        $this->notice = Notice::getKV($notice_id);
 
         if (!$this->notice) {
             // TRANS: Error message displayed trying to delete a non-existing notice.
@@ -68,7 +68,7 @@ class DeletenoticeAction extends Action
         return true;
     }
 
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -174,6 +174,7 @@ class DeletenoticeAction extends Action
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->showForm(_('There was a problem with your session token. ' .
                               'Try again, please.'));
             return;