aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/textreparser/plugins/poll_option.php
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2015-07-06 19:17:40 +0200
committerJoshyPHP <s9e.dev@gmail.com>2015-07-06 19:17:40 +0200
commita44711e57478c6f9d1fa38582deae72cad240560 (patch)
treeec7b7b5876a606bc5931026d55099fba8abe13ec /phpBB/phpbb/textreparser/plugins/poll_option.php
parentf81a2bc7c56cfcb57feaed293be87bbe640dfa5f (diff)
downloadforums-a44711e57478c6f9d1fa38582deae72cad240560.tar
forums-a44711e57478c6f9d1fa38582deae72cad240560.tar.gz
forums-a44711e57478c6f9d1fa38582deae72cad240560.tar.bz2
forums-a44711e57478c6f9d1fa38582deae72cad240560.tar.xz
forums-a44711e57478c6f9d1fa38582deae72cad240560.zip
[ticket/13990] Reparse markup inside of forum rules/description
PHPBB3-13990
Diffstat (limited to 'phpBB/phpbb/textreparser/plugins/poll_option.php')
-rw-r--r--phpBB/phpbb/textreparser/plugins/poll_option.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/textreparser/plugins/poll_option.php b/phpBB/phpbb/textreparser/plugins/poll_option.php
index 7b803146c4..44cacfae62 100644
--- a/phpBB/phpbb/textreparser/plugins/poll_option.php
+++ b/phpBB/phpbb/textreparser/plugins/poll_option.php
@@ -48,7 +48,7 @@ class poll_option extends \phpbb\textreparser\base
*/
protected function get_records_by_range($min_id, $max_id)
{
- $sql = 'SELECT o.topic_id, o.poll_option_id, o.poll_option_text AS text, p.bbcode_uid
+ $sql = 'SELECT o.topic_id, o.poll_option_id, o.poll_option_text AS text, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.bbcode_uid
FROM ' . POLL_OPTIONS_TABLE . ' o, ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p
WHERE o.topic_id BETWEEN ' . $min_id . ' AND ' . $max_id .'
AND t.topic_id = o.topic_id