diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-30 14:17:46 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-30 14:17:46 +0200 |
| commit | 07ba2ed8722c2790d51bdbfdfabab01ea54d7001 (patch) | |
| tree | c8449fca393af84d023fe9bb2c7f2d93469501b0 | |
| parent | 21ee4c18546127d429eea9cc68490dbc52463bfd (diff) | |
| parent | b4e043ba15ba15eab859812b57cee37e04ec3255 (diff) | |
| download | forums-07ba2ed8722c2790d51bdbfdfabab01ea54d7001.tar forums-07ba2ed8722c2790d51bdbfdfabab01ea54d7001.tar.gz forums-07ba2ed8722c2790d51bdbfdfabab01ea54d7001.tar.bz2 forums-07ba2ed8722c2790d51bdbfdfabab01ea54d7001.tar.xz forums-07ba2ed8722c2790d51bdbfdfabab01ea54d7001.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into develop
# By Bruno Ais
# Via Bruno Ais (1) and Joas Schilling (1)
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11638] Variable names goof...
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 9510b047ca..bc54a249a9 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -832,7 +832,7 @@ if (!empty($topic_data['poll_start'])) $poll_total += $poll_option['poll_option_total']; } - $parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; + $parse_flags = ($poll_info[0]['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++) { |