From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 4 Apr 2015 22:27:20 +0000 (+0200)
Subject: fix bug with utf8mb4
X-Git-Tag: 1.9.1alpha2~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=dfc1d3e8f325cdd90d76e26d45668870181ec3b8;p=github%2Fwallabag%2Fwallabag.git

fix bug with utf8mb4
---

diff --git a/install/index.php b/install/index.php
index 7a6eaf3a..fc16af0c 100755
--- a/install/index.php
+++ b/install/index.php
@@ -92,6 +92,8 @@ else if (isset($_POST['install'])) {
                 if ($_POST['mysql_server'] != "") {$server = $_POST['mysql_server'];} // if server and database are filled
                 if ($_POST['mysql_database'] != "") {$database = $_POST['mysql_database'];}
 
+                $sql_structure = file_get_contents('install/mysql.sql');
+
                 if (isset($_POST['mysql_utf8_mb4'])) {
                     //with UTF8-MB4
                     $db_path = 'mysql:host=' . $server . ';dbname=' . $database . ';charset=utf8mb4';
@@ -100,7 +102,7 @@ else if (isset($_POST['install'])) {
                     ));
                     $content = str_replace("define ('MYSQL_USE_UTF8MB4', FALSE);", "define ('MYSQL_USE_UTF8MB4', TRUE);", $content);
                 } else { // regular UTF8
-                    $content = str_replace(" DEFAULT CHARSET=utf8mb4", "", $content); // replace the UTF8-MB4 occurences inside the mysql.sql file
+                    $sql_structure = str_replace(" DEFAULT CHARSET=utf8mb4", "", $sql_structure); // replace the UTF8-MB4 occurences inside the mysql.sql file
                     $db_path = 'mysql:host=' . $server . ';dbname=' . $database;
                     $handle = new PDO($db_path, $_POST['mysql_user'], $_POST['mysql_password']);
                 }