Merge branch 'main' into fix/prettier

opentibiabr · Sep 3, 2024 · 25feb46 · 25feb46
2 parents d596642 + 3e23cb0
commit 25feb46
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/config.php b/config.php
@@ -78,6 +78,7 @@
 	'database_log' => false, // should database queries be logged and and saved into system/logs/database.log?
 	'database_socket' => '', // set if you want to connect to database through socket (example: /var/run/mysqld/mysqld.sock)
 	'database_persistent' => false, // use database permanent connection (like server), may speed up your site
+	'database_encryption' => 'sha1',
 
 	// multiworld system (only TFS 0.3)
 	'multiworld' => false, // use multiworld system?

diff --git a/system/database.php b/system/database.php
@@ -103,6 +103,7 @@
 try {
   $ots->connect([
     'host' => $config['database_host'],
+    'port' => $config['database_port'],
     'user' => $config['database_user'],
     'password' => $config['database_password'],
     'database' => $config['database_name'],

diff --git a/system/templates/forum.show_thread.html.twig b/system/templates/forum.show_thread.html.twig
@@ -79,7 +79,7 @@
                             <div class="PostBody">
                               <div class="PostSeparatorV"></div>
                               <div class="PostUpper">
-                                <div class="PostCharacterText"><b>{{ author_link|raw }}</b><br>
+                                <div class="PostCharacterText"><b>{{ post.player_link|raw }}</b><br>
                                   {% if post.outfit is defined %}
                                     <img
                                       style="margin-left:{% if post.player.getLookType() in [75, 266, 302] %}-0px;margin-top:-0px;width:64px;height:64px;{% else %}-60px;margin-top:-60px;width:128px;height:128px;{% endif %}"