makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2018-01-19 12:20:57 +01:00
commit 39945aec10
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/textreparser/plugins/poll_title.php
View file

@ -34,7 +34,7 @@ class poll_title extends \phpbb\textreparser\row_based_plugin
$sql = 'SELECT t.topic_id AS id, t.poll_title AS text, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.bbcode_uid $sql = 'SELECT t.topic_id AS id, t.poll_title AS text, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.bbcode_uid
FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p
WHERE t.topic_id BETWEEN ' . $min_id . ' AND ' . $max_id .' WHERE t.topic_id BETWEEN ' . $min_id . ' AND ' . $max_id .'
AND t.poll_max_options > 0 AND t.poll_start > 0
AND p.post_id = t.topic_first_post_id'; AND p.post_id = t.topic_first_post_id';
return $sql; return $sql;

11
tests/text_reparser/plugins/fixtures/polls.xml
View file

@ -44,55 +44,66 @@
<column>topic_id</column> <column>topic_id</column>
<column>topic_first_post_id</column> <column>topic_first_post_id</column>
<column>poll_title</column> <column>poll_title</column>
<column>poll_start</column>
<row> <row>
<value>1</value> <value>1</value>
<value>1</value> <value>1</value>
<value>This row should be [b]ignored[/b]</value> <value>This row should be [b]ignored[/b]</value>
<value>1</value>
</row> </row>
<row> <row>
<value>2</value> <value>2</value>
<value>1</value> <value>1</value>
<value>[b]Not bold[/b] :) http://example.org</value> <value>[b]Not bold[/b] :) http://example.org</value>
<value>1</value>
</row> </row>
<row> <row>
<value>3</value> <value>3</value>
<value>2</value> <value>2</value>
<value>[b:abcd1234]Bold[/b:abcd1234] :) http://example.org</value> <value>[b:abcd1234]Bold[/b:abcd1234] :) http://example.org</value>
<value>1</value>
</row> </row>
<row> <row>
<value>4</value> <value>4</value>
<value>3</value> <value>3</value>
<value><![CDATA[[b]Not bold[/b] <!-- s:) --><img src="{SMILIES_PATH}/icon_e_smile.gif" alt=":)" title="Smile" /><!-- s:) --> http://example.org]]></value> <value><![CDATA[[b]Not bold[/b] <!-- s:) --><img src="{SMILIES_PATH}/icon_e_smile.gif" alt=":)" title="Smile" /><!-- s:) --> http://example.org]]></value>
<value>1</value>
</row> </row>
<row> <row>
<value>5</value> <value>5</value>
<value>4</value> <value>4</value>
<value><![CDATA[[b]Not bold[/b] :) <!-- m --><a class="postlink" href="http://example.org">http://example.org</a><!-- m -->]]></value> <value><![CDATA[[b]Not bold[/b] :) <!-- m --><a class="postlink" href="http://example.org">http://example.org</a><!-- m -->]]></value>
<value>1</value>
</row> </row>
<row> <row>
<value>6</value> <value>6</value>
<value>2</value> <value>2</value>
<value><![CDATA[[flash=123,345:abcd1234]http&#58;//example&#46;org/flash&#46;swf[/flash:abcd1234]]]></value> <value><![CDATA[[flash=123,345:abcd1234]http&#58;//example&#46;org/flash&#46;swf[/flash:abcd1234]]]></value>
<value>1</value>
</row> </row>
<row> <row>
<value>7</value> <value>7</value>
<value>1</value> <value>1</value>
<value><![CDATA[[flash=123,345]http://example.org/flash.swf[/flash]]]></value> <value><![CDATA[[flash=123,345]http://example.org/flash.swf[/flash]]]></value>
<value>1</value>
</row> </row>
<row> <row>
<value>8</value> <value>8</value>
<value>2</value> <value>2</value>
<value><![CDATA[[img:abcd1234]http&#58;//example&#46;org/img&#46;png[/img:abcd1234]]]></value> <value><![CDATA[[img:abcd1234]http&#58;//example&#46;org/img&#46;png[/img:abcd1234]]]></value>
<value>1</value>
</row> </row>
<row> <row>
<value>9</value> <value>9</value>
<value>1</value> <value>1</value>
<value><![CDATA[[img]http://example.org/img.png[/img]]]></value> <value><![CDATA[[img]http://example.org/img.png[/img]]]></value>
<value>1</value>
</row> </row>
<row> <row>
<value>1000</value> <value>1000</value>
<value>1</value> <value>1</value>
<value>This row should be [b]ignored[/b]</value> <value>This row should be [b]ignored[/b]</value>
<value>1</value>
</row> </row>
</table> </table>
</dataset> </dataset>