aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/textformatter/data_access.php
diff options
context:
space:
mode:
authorMateBartus <mate.bartus@gmail.com>2015-04-16 23:28:52 +0200
committerMateBartus <mate.bartus@gmail.com>2015-04-16 23:28:52 +0200
commitf23fe9e69d5a49d983af1a06297c162bb2b97f05 (patch)
tree4bb63ce38900309e4a3a22088527cc43e37b7db2 /phpBB/phpbb/textformatter/data_access.php
parentf077b72d0ddabd13350bea276069b68d5df4a89c (diff)
downloadforums-f23fe9e69d5a49d983af1a06297c162bb2b97f05.tar
forums-f23fe9e69d5a49d983af1a06297c162bb2b97f05.tar.gz
forums-f23fe9e69d5a49d983af1a06297c162bb2b97f05.tar.bz2
forums-f23fe9e69d5a49d983af1a06297c162bb2b97f05.tar.xz
forums-f23fe9e69d5a49d983af1a06297c162bb2b97f05.zip
[ticket/13766] Add style_parent_id in textformater's data_access::get_styles()
PHPBB3-13766
Diffstat (limited to 'phpBB/phpbb/textformatter/data_access.php')
-rw-r--r--phpBB/phpbb/textformatter/data_access.php2
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);