mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 22:26:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
This commit is contained in:
Tristan Darricau
2014-11-30 19:07:19 +01:00
parent 0869a77201 70483d6088
commit 319efb026d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/db/migration/data/v310/style_update_p1.php
View File

@ -92,7 +92,7 @@ class style_update_p1 extends \phpbb\db\migration\migration
else else
{ {
$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id $sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id
FROM ' . STYLES_TABLE . ' s, ' . $this->table_prefix . 'styles_template t, ' . $this->table_prefix . "stles_theme c FROM ' . STYLES_TABLE . ' s, ' . $this->table_prefix . 'styles_template t, ' . $this->table_prefix . "styles_theme c
WHERE t.template_id = s.template_id WHERE t.template_id = s.template_id
AND c.theme_id = s.theme_id"; AND c.theme_id = s.theme_id";
} }