makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 03:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3 from nickvergessen/ticket/naderman/11700

Browse source 
Ticket/naderman/11700
This commit is contained in:
Nils Adermann 2013-09-25 03:39:02 -07:00
commit 3209d3c69a
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/install/install_install.php
View file

@ -1179,7 +1179,7 @@ class install_install extends module
// Ok tables have been built, let's fill in the basic information // Ok tables have been built, let's fill in the basic information
$sql_query = file_get_contents('schemas/schema_data.sql'); $sql_query = file_get_contents('schemas/schema_data.sql');
// Deal with any special comments // Deal with any special comments and characters
switch ($data['dbms']) switch ($data['dbms'])
{ {
case 'mssql': case 'mssql':
@ -1191,6 +1191,11 @@ class install_install extends module
case 'postgres': case 'postgres':
$sql_query = preg_replace('#\# POSTGRES (BEGIN|COMMIT) \##s', '\1; ', $sql_query); $sql_query = preg_replace('#\# POSTGRES (BEGIN|COMMIT) \##s', '\1; ', $sql_query);
break; break;
case 'mysql':
case 'mysqli':
$sql_query = str_replace('\\', '\\\\', $sql_query);
break;
} }
// Change prefix // Change prefix

2
phpBB/phpbb/db/migration/data/v310/style_update_p2.php
View file

@ -18,7 +18,7 @@ class style_update_p2 extends \phpbb\db\migration\migration
static public function depends_on() 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() public function update_schema()