From 0912248fd57e6600cb62269096b1fba8cfc43f69 Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Thu, 29 Mar 2018 18:58:22 +0200 Subject: [PATCH] Misc/Typos --- includes/ajaxHandler/profile.class.php | 2 +- pages/guild.php | 2 +- prQueue | 2 +- static/js/Profiler.js | 13 ++++++++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/includes/ajaxHandler/profile.class.php b/includes/ajaxHandler/profile.class.php index 039121ae..e2fcd183 100644 --- a/includes/ajaxHandler/profile.class.php +++ b/includes/ajaxHandler/profile.class.php @@ -718,7 +718,7 @@ class AjaxProfile extends AjaxHandler protected function checkUser($val) { if (User::isValidName($val)) - return $val + return $val; return null; } diff --git a/pages/guild.php b/pages/guild.php index 7696e99b..9c9f7d2f 100644 --- a/pages/guild.php +++ b/pages/guild.php @@ -118,7 +118,7 @@ class GuildPage extends GenericPage /**************/ // tab: members - $member = new LocalProfileList(array(['p.guild', $this->subjectGUID])); + $member = new LocalProfileList(array(['p.guild', $this->subjectGUID], CFG_SQL_LIMIT_NONE)); if (!$member->error) { $this->lvTabs[] = ['profile', array( diff --git a/prQueue b/prQueue index ad162fd7..e26d2f65 100755 --- a/prQueue +++ b/prQueue @@ -87,7 +87,7 @@ while (DB::Aowow()->selectCell('SELECT value FROM ?_config WHERE `key` = "profil case TYPE_GUILD: if (!Profiler::getGuildFromRealm($row['realm'], $row['realmGUID'])) { - $error(TYPE_ARENA_GUILD, $row['realmGUID'], $row['realm']); + $error(TYPE_GUILD, $row['realmGUID'], $row['realm']); continue 2; } diff --git a/static/js/Profiler.js b/static/js/Profiler.js index 04508848..eea038c8 100644 --- a/static/js/Profiler.js +++ b/static/js/Profiler.js @@ -4659,14 +4659,21 @@ function ProfilerInventory(_parent) { _mvInited = true; } - else { /* aowow: the idea of this is to directly access the swf. it just doesn't work with the ZAMviewerfp11.swf */ + /* + aowow: the idea of this is to directly access the swf. + though ZAMviewerfp11.swf is unpredictable af + + custom: try/catch; check for empty equipList + */ + else { _swfModel = $WH.ge(_swfModel.id); if (_swfModel.clearSlots) { _swfModel.setAppearance(_profile.hairstyle, _profile.haircolor, _profile.facetype, _profile.skincolor, _profile.features, _profile.haircolor); - _swfModel.clearSlots(emptySlots); - _swfModel.attachList(equipList); + try { _swfModel.clearSlots(emptySlots); } catch (x) { } + if (equipList.length) + _swfModel.attachList(equipList); } } }