Merge branch '1.0.x' into testing

[quix0rs-gnu-social.git] / lib / settingsaction.php

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index dc60137ab4405c50ab8da8071630d8dc3b239371..c70a5ffa8d7a3fd7b4b52d8c1a1c605aff4012c5 100644 (file)
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -69,6 +69,7 @@ class SettingsAction extends CurrentUserDesignAction
     {
         parent::handle($args);
         if (!common_logged_in()) {
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_('Not logged in.'));
             return;
         } else if (!common_is_real_login()) {
@@ -174,4 +175,8 @@ class SettingsAction extends CurrentUserDesignAction
     {
         return;
     }
+
+    function showProfileBlock()
+    {
+    }
 }