Merge branch 'master' of ssh://git.pk910.de:16110/PHP-P10

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index bef5d05e58096ddd2d9bfd4293fdb65d61e8a316..378d4b6a5acea60ee2bf43e6c16fa57e357fb74f 100644 (file)
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -502,7 +502,7 @@ class Uplink {
 
        private function recv_kick($from, $args) {
                $user = P10_User::getUserByNum($from);
-               if($user == null) {
+               if($user == null && strlen($from) != 2) {
                        trigger_error("An unknown user tries to kick another user on recv_kick.", E_USER_ERROR);
                        return;
                }
@@ -516,7 +516,7 @@ class Uplink {
                }
                if($this->eventHandler)
                $this->eventHandler->event_kick($user, $target, $channel, $args[1]);
-               $channel->partUser($user);
+               $channel->partUser($target);
        }
 
        private function recv_kill($from, $args) {