Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline...

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

diff --git a/actions/removepeopletag.php b/actions/removepeopletag.php
index 93cb5b152f6a0bc8622031f874d4ad344946fc4c..d27175f566ab7f3d17f8ca56edfea14d8583931a 100644 (file)
--- a/actions/removepeopletag.php
+++ b/actions/removepeopletag.php
@@ -112,18 +112,6 @@ class RemovepeopletagAction extends Action
             return false;
         }
 
-        // OMB 0.1 doesn't have a mechanism for local-server-
-        // originated tag.
-
-        $omb01 = Remote_profile::staticGet('id', $tagged_id);
-
-        if (!empty($omb01)) {
-            // TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-            $this->clientError(_('You cannot (un)list an OMB 0.1 '.
-                                 'remote profile with this action.'));
-            return false;
-        }
-
         return true;
     }
 
@@ -147,9 +135,9 @@ class RemovepeopletagAction extends Action
             $user = User::staticGet('id', $this->tagged->id);
             if ($user) {
                 $this->clientError(
-                        // TRANS: Client error displayed when an unknown error occurs while listing a user.
+                        // TRANS: Client error displayed when an unknown error occurs while delisting a user.
                         // TRANS: %s is a username.
-                        sprintf(_('There was an unexpected error while listing %s.'),
+                        sprintf(_('There was an unexpected error while delisting %s.'),
                         $user->nickname));
             } else {
                 // TRANS: Client error displayed when an unknown error occurs while listing a user.