aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-11-30 19:07:14 +0100
committerTristan Darricau <github@nicofuma.fr>2014-11-30 19:07:14 +0100
commit70483d60886ad416c3dd40f29e1128e031322e1e (patch)
tree5068ff11058a23a9a94fd95df0ae8bc58c0673b6 /phpBB/phpbb
parentac8b07ddd934c9bcda0d5ce38fb7e438083afc7b (diff)
parent499c1467df41bad32d61032b0af33056e4d34a32 (diff)
downloadforums-70483d60886ad416c3dd40f29e1128e031322e1e.tar
forums-70483d60886ad416c3dd40f29e1128e031322e1e.tar.gz
forums-70483d60886ad416c3dd40f29e1128e031322e1e.tar.bz2
forums-70483d60886ad416c3dd40f29e1128e031322e1e.tar.xz
forums-70483d60886ad416c3dd40f29e1128e031322e1e.zip
Merge pull request #3204 from rxu/ticket/13405
[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php * rxu/ticket/13405: [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/db/migration/data/v310/style_update_p1.php2
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";
}