From ed55626165ad402507864ab21bb2ee64a0d70cbd Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 25 Sep 2013 10:01:44 +0200 Subject: [PATCH 1/2] [ticket/11700] Fix unresolvable condition in migration PHPBB3-11700 --- phpBB/phpbb/db/migration/data/v310/style_update_p2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php index 6c3b0de2a1..202a8409fb 100644 --- a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php +++ b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php @@ -18,7 +18,7 @@ class style_update_p2 extends \phpbb\db\migration\migration static public function depends_on() { - return array('\phpbb\db\migration\data0\style_update_p1'); + return array('\phpbb\db\migration\data\v310\style_update_p1'); } public function update_schema() From 625411587d5ef1e6a01383e150293b461c2331a5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 25 Sep 2013 11:25:58 +0200 Subject: [PATCH 2/2] [ticket/11700] Escape Backslashes from schema_data.sql for MySQLi PHPBB3-11700 --- phpBB/install/install_install.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 107da0f90a..c273660d08 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1179,7 +1179,7 @@ class install_install extends module // Ok tables have been built, let's fill in the basic information $sql_query = file_get_contents('schemas/schema_data.sql'); - // Deal with any special comments + // Deal with any special comments and characters switch ($data['dbms']) { case 'mssql': @@ -1191,6 +1191,11 @@ class install_install extends module case 'postgres': $sql_query = preg_replace('#\# POSTGRES (BEGIN|COMMIT) \##s', '\1; ', $sql_query); break; + + case 'mysql': + case 'mysqli': + $sql_query = str_replace('\\', '\\\\', $sql_query); + break; } // Change prefix