merge 0.9.x into 1.0.x

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

diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index d490cd9875f53767b6261189555a7af5f1e41112..a6694cd837c929327da53689ea267058a8ccca92 100644 (file)
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -180,8 +180,8 @@ class GrouplogoAction extends GroupDesignAction
 
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            // TRANS: Server error displayed coming across a request from a user without a profile.
-            $this->serverError(_('User without matching profile.'));
+            // TRANS: Error message displayed when referring to a user without a profile.
+            $this->serverError(_('User has no profile.'));
             return;
         }
 
@@ -458,7 +458,7 @@ class GrouplogoAction extends GroupDesignAction
         $this->autofocus('avatarfile');
     }
 
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new GroupNav($this, $this->group);
         $nav->show();