summaryrefslogtreecommitdiffstats
path: root/sites
diff options
context:
space:
mode:
authorNathaniel Catchpole2015-06-02 16:00:14 (GMT)
committerNathaniel Catchpole2015-06-02 16:06:45 (GMT)
commit537da55a56a67173063aa78ba96dd72d2b8ab76c (patch)
treef40eb204429969eb645b1ee243775584903f447e /sites
parent7d3e205b9ae1341a1929b8ec729d18b5bd57ec06 (diff)
Revert "Issue #1314214 by stefan.r, phayes, ergophobe, YesCT, damienwhaley, Tor Arne Thune, kbasarab, pfrenssen, basic, yannickoo, simolokid: MySQL driver does not support full UTF-8 (emojis, asian symbols, mathematical symbols)"
This reverts commit b105158ab75a593a59d26b10897f10fa1e7e5f1e.
Diffstat (limited to 'sites')
-rw-r--r--sites/default/default.settings.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index d894b11..ef83939 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -75,7 +75,7 @@
* 'host' => 'localhost',
* 'port' => 3306,
* 'prefix' => 'myprefix_',
- * 'collation' => 'utf8mb4_general_ci',
+ * 'collation' => 'utf8_general_ci',
* );
* @endcode
*
@@ -127,7 +127,7 @@
* 'password' => 'password',
* 'host' => 'localhost',
* 'prefix' => 'main_',
- * 'collation' => 'utf8mb4_general_ci',
+ * 'collation' => 'utf8_general_ci',
* );
* @endcode
*