Merge branch '0.9.x' into 1.0.x

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

diff --git a/lib/command.php b/lib/command.php
index ca09da28f68f4977ddb542cdb42d074b6bf7adfe..30db9d0691762bdfa2372ebee8326f13e1140263 100644 (file)
--- a/lib/command.php
+++ b/lib/command.php
@@ -382,7 +382,7 @@ class DropCommand extends Command
         } catch (Exception $e) {
             // TRANS: Message given having failed to remove a user from a group.
             // TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-            $channel->error($cur, sprintf(_('Could not remove user %s from group %s'),
+            $channel->error($cur, sprintf(_('Could not remove user %1$s from group %2$s'),
                                           $cur->nickname, $group->nickname));
             return;
         }
@@ -678,7 +678,7 @@ class OffCommand extends Command
     }
     function handle($channel)
     {
-        if ($other) {
+        if ($this->other) {
             $channel->error($this->user, _("Command not yet implemented."));
         } else {
             if ($channel->off($this->user)) {
@@ -701,7 +701,7 @@ class OnCommand extends Command
 
     function handle($channel)
     {
-        if ($other) {
+        if ($this->other) {
             $channel->error($this->user, _("Command not yet implemented."));
         } else {
             if ($channel->on($this->user)) {