diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-17 00:07:04 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-17 00:07:04 +0200 |
| commit | ecc65f564d9f966a4d5b0f22281024f49cc8b22b (patch) | |
| tree | 1f73a6f924665ef872a607c28f313a8c982f4fa2 /phpBB/phpbb/textformatter/data_access.php | |
| parent | c89384eb86c0d2ff89f9df69dbd14fb61cfcb624 (diff) | |
| parent | f23fe9e69d5a49d983af1a06297c162bb2b97f05 (diff) | |
| download | forums-ecc65f564d9f966a4d5b0f22281024f49cc8b22b.tar forums-ecc65f564d9f966a4d5b0f22281024f49cc8b22b.tar.gz forums-ecc65f564d9f966a4d5b0f22281024f49cc8b22b.tar.bz2 forums-ecc65f564d9f966a4d5b0f22281024f49cc8b22b.tar.xz forums-ecc65f564d9f966a4d5b0f22281024f49cc8b22b.zip | |
Merge pull request #3539 from MateBartus/ticket/13766
[ticket/13766] Add style_parent_id in textformater's data_access::get_st...
Diffstat (limited to 'phpBB/phpbb/textformatter/data_access.php')
| -rw-r--r-- | phpBB/phpbb/textformatter/data_access.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/textformatter/data_access.php b/phpBB/phpbb/textformatter/data_access.php index 8938d66935..2103bf8e60 100644 --- a/phpBB/phpbb/textformatter/data_access.php +++ b/phpBB/phpbb/textformatter/data_access.php @@ -115,7 +115,7 @@ class data_access */ protected function get_styles() { - $sql = 'SELECT style_id, style_path, bbcode_bitfield FROM ' . $this->styles_table; + $sql = 'SELECT style_id, style_path, style_parent_id, bbcode_bitfield FROM ' . $this->styles_table; $result = $this->db->sql_query($sql); $rows = $this->db->sql_fetchrowset($result); $this->db->sql_freeresult($result); |