Merge branch 'develop' into feature/new-router

# Conflicts:
#	composer.json
#	system/login.php
This commit is contained in:
slawkens
2023-02-03 07:31:39 +01:00
199 changed files with 4166 additions and 1379 deletions

View File

@@ -21,7 +21,7 @@ if(count($guilds_list) > 0)
{
foreach ($guilds_list as $guild) {
$guild_logo = $guild->getCustomField('logo_name');
if (empty($guild_logo) || !file_exists('images/guilds/' . $guild_logo))
if (empty($guild_logo) || !file_exists(GUILD_IMAGES_DIR . $guild_logo))
$guild_logo = "default.gif";
$description = $guild->getCustomField('description');
@@ -38,4 +38,4 @@ $twig->display('guilds.list.html.twig', array(
'guilds' => $guilds,
'logged' => isset($logged) ? $logged : false,
'isAdmin' => admin(),
));
));