diff --git a/pages/more.php b/pages/more.php index c4da73ea..7cad1123 100644 --- a/pages/more.php +++ b/pages/more.php @@ -191,7 +191,7 @@ class MorePage extends GenericPage SELECT a.id AS ARRAY_KEY, a.displayName AS username, - a.userGroups AS groups, + a.userGroups AS `groups`, a.joinDate AS creation, SUM(r.amount) AS reputation, SUM(IF(r.`action` = 3, 1, 0)) AS comments, diff --git a/setup/tools/CLISetup.class.php b/setup/tools/CLISetup.class.php index b9e8cf4f..3faa2909 100644 --- a/setup/tools/CLISetup.class.php +++ b/setup/tools/CLISetup.class.php @@ -117,11 +117,10 @@ class CLISetup // engb and enus are identical for all intents and purposes $from = ['engb', 'esmx', 'encn']; $to = ['enus', 'eses', 'zhcn']; - $_['locales'] = str_ireplace($from, $to, strtolower($_['locales'])); + $opts['locales'] = str_ireplace($from, $to, strtolower($opts['locales'])); - self::$locales = array_intersect(Util::$localeStrings, explode(',', $_['locales'])); + self::$locales = array_intersect(Util::$localeStrings, explode(',', $opts['locales'])); } - if (!self::$locales) self::$locales = array_filter(Util::$localeStrings); diff --git a/setup/tools/filegen/profiler.func.php b/setup/tools/filegen/profiler.func.php index 9582885a..088eb152 100644 --- a/setup/tools/filegen/profiler.func.php +++ b/setup/tools/filegen/profiler.func.php @@ -386,7 +386,7 @@ if (!CLI) // excludes; type => [excludeGroupBit => [typeIds]] $excludes = []; - $exData = DB::Aowow()->selectCol('SELECT `type` AS ARRAY_KEY, `typeId` AS ARRAY_KEY2, groups FROM ?_profiler_excludes'); + $exData = DB::Aowow()->selectCol('SELECT `type` AS ARRAY_KEY, `typeId` AS ARRAY_KEY2, `groups` FROM ?_profiler_excludes'); for ($i = 0; (1 << $i) < PR_EXCLUDE_GROUP_ANY; $i++) foreach ($exData as $type => $data) if ($ids = array_keys(array_filter($data, function ($x) use ($i) { return $x & (1 << $i); } )))