diff --git a/system/pages/characters.php b/system/pages/characters.php index fd6af13e..e51a44bd 100644 --- a/system/pages/characters.php +++ b/system/pages/characters.php @@ -400,7 +400,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil 'rank' => isset($guild_name) ? $rank_of_player->getName() : null, 'link' => isset($guild_name) ? getGuildLink($guild_name) : null ), - 'comment' => !empty($comment) ? wordwrap(nl2br($comment), 60, "
", true) : null, + 'comment' => !empty($comment) ? nl2br($comment) : null, 'skills' => isset($skills) ? $skills : null, 'quests_enabled' => $quests_enabled, 'quests' => isset($quests) ? $quests : null, diff --git a/system/pages/guilds/list_of_guilds.php b/system/pages/guilds/list_of_guilds.php index 1d827c7f..8f497075 100644 --- a/system/pages/guilds/list_of_guilds.php +++ b/system/pages/guilds/list_of_guilds.php @@ -25,7 +25,7 @@ if(count($guilds_list) > 0) $description = $guild->getCustomField('description'); $description_with_lines = str_replace(array("\r\n", "\n", "\r"), '
', $description, $count); if ($count < $config['guild_description_lines_limit']) - $description = wordwrap(nl2br($description), 60, "
", true); + $description = nl2br($description); $guildName = $guild->getName(); $guilds[] = array('name' => $guildName, 'logo' => $guild_logo, 'link' => getGuildLink($guildName, false), 'description' => $description); @@ -36,4 +36,4 @@ $twig->display('guilds.list.html.twig', array( 'guilds' => $guilds, 'logged' => isset($logged) ? $logged : false, 'isAdmin' => admin(), -)); \ No newline at end of file +)); diff --git a/system/pages/guilds/show.php b/system/pages/guilds/show.php index ebd04ce6..df9de9e5 100644 --- a/system/pages/guilds/show.php +++ b/system/pages/guilds/show.php @@ -83,7 +83,7 @@ if(empty($guild_logo) || !file_exists('images/guilds/' . $guild_logo)) $description = $guild->getCustomField('description'); $description_with_lines = str_replace(array("\r\n", "\n", "\r"), '
', $description, $count); if($count < $config['guild_description_lines_limit']) - $description = wordwrap(nl2br($description), 60, "
", true); + $description = nl2br($description); //$description = $description_with_lines; $guild_owner = $guild->getOwner(); @@ -159,4 +159,4 @@ $twig->display('guilds.view.html.twig', array( 'invited_list' => $invited_list, 'show_accept_invite' => $show_accept_invite, 'useGuildNick' => $useGuildNick -)); \ No newline at end of file +)); diff --git a/system/templates/characters.html.twig b/system/templates/characters.html.twig index a388de50..1726ad05 100644 --- a/system/templates/characters.html.twig +++ b/system/templates/characters.html.twig @@ -142,7 +142,7 @@ {% set rows = rows + 1 %} Comment: - {{ comment|raw }} + {{ comment|raw }} {% endif %} diff --git a/system/templates/guilds.list.html.twig b/system/templates/guilds.list.html.twig index 63d22933..4948c6d0 100644 --- a/system/templates/guilds.list.html.twig +++ b/system/templates/guilds.list.html.twig @@ -44,7 +44,7 @@ - + {{ guild.name }}{% if isAdmin %} - Delete this guild (for ADMIN only!){% endif %} diff --git a/system/templates/guilds.view.html.twig b/system/templates/guilds.view.html.twig index 602af487..0a55b41a 100644 --- a/system/templates/guilds.view.html.twig +++ b/system/templates/guilds.view.html.twig @@ -47,7 +47,7 @@ -
+
{% if description is not empty %} {{ description|raw }}