From faf9e6e4a94918496d9145f1f6ef3b51ea9dec49 Mon Sep 17 00:00:00 2001
From: lopar <lopar.4ever@gmail.com>
Date: Sat, 31 Mar 2018 01:44:40 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D1=83=D1=81=20=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=BD=20=D0=B2=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=BD=D1=8B?=
 =?UTF-8?q?=D0=B9=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/nick.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/classes/nick.php b/classes/nick.php
index faaa01a..7a5f455 100644
--- a/classes/nick.php
+++ b/classes/nick.php
@@ -17,15 +17,10 @@ class nick
     {
         if (!$this->user_data) {
             $user = db::c()->query('
-              SELECT 
-                `login`, 
-                `level`, 
-                `align`, 
-                (SELECT `short` FROM `clans` WHERE `clans`.`id` = `klan`) AS `klan`, 
-                (SELECT 1 FROM `effects` WHERE `owner` = `users`.`id` AND `type` = 1022) AS `invis`, 
-                `hp`, 
-                `maxhp` 
-              FROM `users` WHERE `id` = ?i', $playerId)->fetch_assoc();
+              SELECT `login`, `level`, U.`align`, `short`, (SELECT 1 FROM `effects` WHERE `owner` = U.`id` AND `type` = 1022) AS `invis`, U.`hp`, `maxhp`
+              FROM `users` U
+              LEFT JOIN `clans` C ON C.`id` = `klan`
+              WHERE U.`id` = ?i', $playerId)->fetch_assoc();
             $this->user_data = $user;
         }
 
@@ -46,12 +41,12 @@ class nick
      */
     public function full($showInvisibility = 0)
     {
-        $n ='';
+        $n = '';
         if ($showInvisibility && $this->user_data['invis']) {
             return '<i>невидимка</i>';
         } else {
             if ($this->user_data['align']) {
-                $n .= sprintf('<img src="i/align_%s.gif">',  intval($this->user_data['align']));
+                $n .= sprintf('<img src="i/align_%s.gif">', intval($this->user_data['align']));
             }
             if ($this->user_data['klan']) {
                 $n .= sprintf('<img src="i/klan/%s.gif">', htmlspecialchars($this->user_data['klan']));