diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-25 03:39:02 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-25 03:39:02 -0700 |
| commit | 3209d3c69a668607ab4ba8b85ce2ee80d674c43b (patch) | |
| tree | 8c7671f4e9d401c16df2b023dd804826ccca4486 | |
| parent | 1f9f96926f9231efb39952d86e6f6ad8c7e71fb5 (diff) | |
| parent | 625411587d5ef1e6a01383e150293b461c2331a5 (diff) | |
| download | forums-3209d3c69a668607ab4ba8b85ce2ee80d674c43b.tar forums-3209d3c69a668607ab4ba8b85ce2ee80d674c43b.tar.gz forums-3209d3c69a668607ab4ba8b85ce2ee80d674c43b.tar.bz2 forums-3209d3c69a668607ab4ba8b85ce2ee80d674c43b.tar.xz forums-3209d3c69a668607ab4ba8b85ce2ee80d674c43b.zip | |
Merge pull request #3 from nickvergessen/ticket/naderman/11700
Ticket/naderman/11700
| -rw-r--r-- | phpBB/install/install_install.php | 7 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/style_update_p2.php | 2 |
2 files changed, 7 insertions, 2 deletions
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 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() |