diff --git a/includes/profiler.class.php b/includes/profiler.class.php index 43077f0b..86554b07 100644 --- a/includes/profiler.class.php +++ b/includes/profiler.class.php @@ -533,8 +533,14 @@ class Profiler // cant reasonably get to the castItem from enchantId and slot $profSpec = DB::Aowow()->selectCol('SELECT id AS ARRAY_KEY, skillLevel AS "1", skillLine AS "0" FROM ?_itemenchantment WHERE id IN (?a)', $permEnch); - foreach ($permEnch as $eId) + foreach ($permEnch as $slot => $eId) { + if (!isset($profSpec[$eId])) + { + trigger_error('char #'.$charGuid.' on realm #'.$realmId.' has item in slot #'.$slot.' with invalid perm enchantment #'.CLI::bold($eId), E_USER_WARNING); + continue; + } + if ($x = Util::getEnchantmentScore(0, 0, !!$profSpec[$eId][1], $eId)) $data['gearscore'] += $x; else if ($profSpec[$eId][0] != 776) // not runeforging diff --git a/includes/types/arenateam.class.php b/includes/types/arenateam.class.php index 90b4a0b7..78618e75 100644 --- a/includes/types/arenateam.class.php +++ b/includes/types/arenateam.class.php @@ -314,7 +314,7 @@ class RemoteArenaTeamList extends ArenaTeamList } foreach (Util::createSqlBatchInsert($memberData) as $ins) - DB::Aowow()->query('INSERT IGNORE INTO ?_profiler_arena_team_member (?#) VALUES '.$ins, array_keys(reset($memberData))); + DB::Aowow()->query('INSERT INTO ?_profiler_arena_team_member (?#) VALUES '.$ins.' ON DUPLICATE KEY UPDATE `id` = `id`', array_keys(reset($memberData))); } } } diff --git a/pages/areatrigger.php b/pages/areatrigger.php index 5230b35e..a9bf1546 100644 --- a/pages/areatrigger.php +++ b/pages/areatrigger.php @@ -87,7 +87,7 @@ class AreaTriggerPage extends GenericPage // tab: conditions $cnd = new Conditions(); $cnd->getBySourceEntry($this->typeId, Conditions::SRC_AREATRIGGER_CLIENT)->prepare(); - if ($tab = $cnd->toListviewTab()); + if ($tab = $cnd->toListviewTab()) { $this->extendGlobalData($cnd->getJsGlobals()); $this->lvTabs[] = $tab; diff --git a/pages/utility.php b/pages/utility.php index d08c702e..e6a552bf 100644 --- a/pages/utility.php +++ b/pages/utility.php @@ -114,7 +114,7 @@ class UtilityPage extends GenericPage $this->lvTabs[] = ['commentpreview', ['data' => $comments]]; array_walk($replies, fn(&$d) => $d['date'] = date(Util::$dateFormatInternal, $d['date'])); - $this->lvTabs[] = ['commentpreview', ['data' => $replies]]; + $this->lvTabs[] = ['replypreview', ['data' => $replies]]; } break; diff --git a/static/js/locale_dede.js b/static/js/locale_dede.js index d3cf3fc9..d1509815 100644 --- a/static/js/locale_dede.js +++ b/static/js/locale_dede.js @@ -4894,8 +4894,8 @@ var LANG = { /* AoWoW: start custom */ - tab_conditions: 'Bedingungen', - tab_condition_for: 'Bedingung for', + tab_conditions: 'Konditionen', + tab_condition_for: 'Kondition für', cnd_either: 'Entweder', cnd_or: 'Oder',