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

[ticket/11271] Fix tabs and use !empty( ) instead of count( )

Browse source 
PHPBB3-11271
This commit is contained in:
Dhruv 2013-12-26 23:59:26 +05:30
parent 6611329d83
commit f7c764986f
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
phpBB/feed.php
View file

@ -326,7 +326,7 @@ function feed_generate_content($content, $uid, $bitfield, $options, $forum_id, $
$content = preg_replace( '#<(script|iframe)([^[]+)\1>#siU', ' <strong>$1</strong> ', $content); $content = preg_replace( '#<(script|iframe)([^[]+)\1>#siU', ' <strong>$1</strong> ', $content);
// Parse inline images to display with the feed // Parse inline images to display with the feed
if (count($post_attachments) > 0) if (!empty($post_attachments))
{ {
$update_count = array(); $update_count = array();
parse_attachments($forum_id, $content, $post_attachments, $update_count); parse_attachments($forum_id, $content, $post_attachments, $update_count);
@ -713,13 +713,13 @@ class phpbb_feed_post_base extends phpbb_feed_base
global $db; global $db;
$sql_array = array( $sql_array = array(
'SELECT' => 'a.*', 'SELECT' => 'a.*',
'FROM' => array( 'FROM' => array(
ATTACHMENTS_TABLE => 'a' ATTACHMENTS_TABLE => 'a'
), ),
'WHERE' => 'a.in_message = 0 ', 'WHERE' => 'a.in_message = 0 ',
'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC' 'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC',
); );
if (isset($this->topic_id)) if (isset($this->topic_id))
{ {
@ -728,11 +728,11 @@ class phpbb_feed_post_base extends phpbb_feed_base
else if (isset($this->forum_id)) else if (isset($this->forum_id))
{ {
$sql_array['LEFT_JOIN'] = array( $sql_array['LEFT_JOIN'] = array(
array( array(
'FROM' => array(TOPICS_TABLE => 't'), 'FROM' => array(TOPICS_TABLE => 't'),
'ON' => 'a.topic_id = t.topic_id' 'ON' => 'a.topic_id = t.topic_id',
) )
); );
$sql_array['WHERE'] .= 'AND t.forum_id = ' . (int) $this->forum_id; $sql_array['WHERE'] .= 'AND t.forum_id = ' . (int) $this->forum_id;
} }