aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-08-10 13:20:04 +0200
committerAndreas Fischer <bantu@phpbb.com>2015-08-10 13:20:04 +0200
commit92b23df864d7f0d781956dca8663070d922f75cc (patch)
treecc9095700ff4ad88e3dfd680185ea17925594cc2 /phpBB/phpbb
parent32c3267295d20b14a9552f4fc4c66feb7713c550 (diff)
parent3bd5fe6be8fbd1f70c8dc4535b9c6d3d96e1e59d (diff)
downloadforums-92b23df864d7f0d781956dca8663070d922f75cc.tar
forums-92b23df864d7f0d781956dca8663070d922f75cc.tar.gz
forums-92b23df864d7f0d781956dca8663070d922f75cc.tar.bz2
forums-92b23df864d7f0d781956dca8663070d922f75cc.tar.xz
forums-92b23df864d7f0d781956dca8663070d922f75cc.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
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 3b0d53d803..2c7b7edf2e 100644
--- a/phpBB/phpbb/db/migration/data/v310/style_update_p1.php
+++ b/phpBB/phpbb/db/migration/data/v310/style_update_p1.php
@@ -160,7 +160,7 @@ class style_update_p1 extends \phpbb\db\migration\migration
FROM ' . STYLES_TABLE . "
WHERE style_name = 'prosilver'";
$result = $this->sql_query($sql);
- $default_style = $this->db->sql_fetchfield($result);
+ $default_style = $this->db->sql_fetchfield('style_id');
$this->db->sql_freeresult($result);
$this->config->set('default_style', $default_style);