Merge branch 'develop' into feature/refactor-account-lost

install/steps/7-finish.php

@@ -93,6 +93,8 @@ if(USE_ACCOUNT_SALT)
 
 $account_used->setCustomField('web_flags', FLAG_ADMIN + FLAG_SUPER_ADMIN);
 $account_used->setCustomField('country', 'us');
+$account_used->setCustomField('email_verified', 1);
+
 if($db->hasColumn('accounts', 'group_id'))
 	$account_used->setCustomField('group_id', $groups->getHighestId());
 if($db->hasColumn('accounts', 'type'))

phpstan.neon

@@ -29,6 +29,7 @@ parameters:
 		- '#Variable \$[a-zA-Z0-9\\_]+ might not be defined#'
 		# Eloquent models
 		- '#Call to an undefined static method [a-zA-Z0-9\\_]+::[a-zA-Z0-9\\_]+()#'
+		- '#Call to an undefined method object::toArray\(\)#'
 		# system/pages/highscores.php
 		- '#Call to an undefined method Illuminate\\Database\\Query\\Builder::withOnlineStatus\(\)#'
 		- '#Access to an undefined property Illuminate\\Database\\Eloquent\\Model::\$online_status#'

system/pages/monsters.php

@@ -39,10 +39,11 @@ if (empty($_REQUEST['name'])) {
 
 // display monster
 $monster_name = urldecode(stripslashes(ucwords(strtolower($_REQUEST['name']))));
-$monster = Monster::where('hide', '!=', 1)->where('name', $monster_name)->first();
+$monsterModel = Monster::where('hide', '!=', 1)->where('name', $monster_name)->first();
 
-if ($monster && isset($monster->name)) {
-	$monster = $monster->toArray();
+if ($monsterModel && isset($monsterModel->name)) {
+	/** @var array $monster */
+	$monster = $monsterModel->toArray();
 
 	function sort_by_chance($a, $b)
 	{

system/templates/highscores.html.twig

@@ -11,7 +11,7 @@
 						<select onchange="location = this.value;" aria-label="skillFilter" id="skillFilter">
 							{% set i = 0 %}
 							{% for link, name in types %}
-								<option value="{{ getLink('highscores') }}/{{ link }}{% if vocation is defined %}/{{ vocation }}{% endif %}" class="size_xs">{{ name }}</option>
+								<option value="{{ getLink('highscores') }}/{{ link }}{% if vocation is not null %}{{ vocation }}{% endif %}" class="size_xs">{{ name }}</option>
 							{% endfor %}
 						</select>
 					</td>
@@ -105,7 +105,7 @@
 				<tr bgcolor="{{ config.lightborder }}">
 					<td>
 						{% for link, name in types %}
-						<a href="{{ getLink('highscores') }}/{{ link }}{% if vocation is defined %}/{{ vocation }}{% endif %}" class="size_xs">{{ name }}</a><br/>
+						<a href="{{ getLink('highscores') }}/{{ link }}{% if vocation is not null %}/{{ vocation }}{% endif %}" class="size_xs">{{ name }}</a><br/>
 						{% endfor %}
 					</td>
 				</tr>