diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-11-30 19:07:19 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-30 19:07:19 +0100 |
| commit | 319efb026d29adbb9cc50da9641ea07304b9bb2d (patch) | |
| tree | 6b400af3cee7c6551c24022c613431d1c64052be /phpBB | |
| parent | 0869a77201e2603dd30964554184a660c7c2754d (diff) | |
| parent | 70483d60886ad416c3dd40f29e1128e031322e1e (diff) | |
| download | forums-319efb026d29adbb9cc50da9641ea07304b9bb2d.tar forums-319efb026d29adbb9cc50da9641ea07304b9bb2d.tar.gz forums-319efb026d29adbb9cc50da9641ea07304b9bb2d.tar.bz2 forums-319efb026d29adbb9cc50da9641ea07304b9bb2d.tar.xz forums-319efb026d29adbb9cc50da9641ea07304b9bb2d.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/style_update_p1.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/style_update_p1.php b/phpBB/phpbb/db/migration/data/v310/style_update_p1.php index 5a3a1d5de7..e8d3a3af64 100644 --- a/phpBB/phpbb/db/migration/data/v310/style_update_p1.php +++ b/phpBB/phpbb/db/migration/data/v310/style_update_p1.php @@ -92,7 +92,7 @@ class style_update_p1 extends \phpbb\db\migration\migration 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 - 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 AND c.theme_id = s.theme_id"; } |