Changeset 683 for trunk/lib/App.inc.php

Timestamp:

May 19, 2019 10:51:34 PM (5 years ago)

Author:

anonymous

Message:

Add support for mysql-specific character sets and collations

File:

• trunk/lib/App.inc.php (modified) (4 diffs)

trunk/lib/App.inc.php

@@ -124 +124 @@
         'user_timezone' => 'UTC',
         'php_timezone' => 'UTC',
-        'mysql_timezone' => 'UTC',
+        'db_timezone' => 'UTC',
 
         // Use php sessions?
@@ -141 +141 @@
         'enable_db_session_handler' => false,
 
+        // db_* parameters are passed to the DB object in $app->start().
         // DB credentials should be set as apache environment variables in httpd.conf, readable only by root.
         'db_server' => null,
@@ -146 +147 @@
         'db_user' => null,
         'db_pass' => null,
+        'db_character_set' => '',
+        'db_collation' => '',
 
         // CLI scripts will need this JSON file in the include path.
@@ -427 +430 @@
                 'db_debug' => $this->getParam('db_debug'),
                 'db_die_on_failure' => $this->getParam('db_die_on_failure'),
-                'timezone' => $this->getParam('mysql_timezone'),
+                'timezone' => $this->getParam('db_timezone'),
+                'character_set' => $this->getParam('db_character_set'),
+                'collation' => $this->getParam('db_collation'),
             ));