diff --git a/fbattle.php b/fbattle.php index b216fe4..11aebb1 100644 --- a/fbattle.php +++ b/fbattle.php @@ -149,7 +149,7 @@ $fbattle = new fbattle($user['battle']);
- +
@@ -484,7 +484,7 @@ $fbattle = new fbattle($user['battle']); return == 1) { - echo showinf_pers($fbattle->enemy, 1, 1); + echo showinf_pers($fbattle->enemy, 1); } else { if ($fbattle->battle_data['type'] == 4 || $fbattle->battle_data['type'] == 5) { $a = array(6, 16); diff --git a/functions.php b/functions.php index ba49bed..6e896a7 100644 --- a/functions.php +++ b/functions.php @@ -662,11 +662,10 @@ function ClanImage($clan_id) { $clanimg = db::c()->query('SELECT `short` FROM `clans` WHERE `id` = ?i ', $clan_id)->fetch_assoc(); if ($clanimg['short']) { - $clanimg = $clanimg['short']; + return $clanimg['short']; } else { - $clanimg = "1x1"; + return "1x1"; } - return $clanimg; } function GiveExp($id, $exp) @@ -917,7 +916,7 @@ function timetoheals($user) * * @return string */ -function showinf_pers($id, $pas = 0, $battle = 0, $me = 0, $main = false) //FIXME 37 запросов! ТРИДЦАТЬ СЕМЬ! Чтобы отобразить предметы на персонаже. +function showinf_pers($id, $battle = 0, $me = 0, $main = false) //FIXME 37 запросов! ТРИДЦАТЬ СЕМЬ! Чтобы отобразить предметы на персонаже. { global $rooms; $r = ''; diff --git a/inf.php b/inf.php index 1bbd428..61879cf 100644 --- a/inf.php +++ b/inf.php @@ -37,7 +37,7 @@ if (empty($user['id'])): ?>
- ';