diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-12-26 23:59:26 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-12-27 00:22:29 +0530 |
| commit | f7c764986f9578c703258943404f7cadda3bd858 (patch) | |
| tree | 624a9eda6a17ce15780d31ad2383653c5337f247 /phpBB | |
| parent | 6611329d837b1698f24d9d0713cdad9c60007e4f (diff) | |
| download | forums-f7c764986f9578c703258943404f7cadda3bd858.tar forums-f7c764986f9578c703258943404f7cadda3bd858.tar.gz forums-f7c764986f9578c703258943404f7cadda3bd858.tar.bz2 forums-f7c764986f9578c703258943404f7cadda3bd858.tar.xz forums-f7c764986f9578c703258943404f7cadda3bd858.zip | |
[ticket/11271] Fix tabs and use !empty( ) instead of count( )
PHPBB3-11271
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/feed.php | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php index 86d74bc3b7..a3528ddd71 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -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); // Parse inline images to display with the feed - if (count($post_attachments) > 0) + if (!empty($post_attachments)) { $update_count = array(); parse_attachments($forum_id, $content, $post_attachments, $update_count); @@ -713,13 +713,13 @@ class phpbb_feed_post_base extends phpbb_feed_base global $db; $sql_array = array( - 'SELECT' => 'a.*', - 'FROM' => array( - ATTACHMENTS_TABLE => 'a' - ), - 'WHERE' => 'a.in_message = 0 ', - 'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC' - ); + 'SELECT' => 'a.*', + 'FROM' => array( + ATTACHMENTS_TABLE => 'a' + ), + 'WHERE' => 'a.in_message = 0 ', + 'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC', + ); if (isset($this->topic_id)) { @@ -728,11 +728,11 @@ class phpbb_feed_post_base extends phpbb_feed_base else if (isset($this->forum_id)) { $sql_array['LEFT_JOIN'] = array( - array( - 'FROM' => array(TOPICS_TABLE => 't'), - 'ON' => 'a.topic_id = t.topic_id' - ) - ); + array( + 'FROM' => array(TOPICS_TABLE => 't'), + 'ON' => 'a.topic_id = t.topic_id', + ) + ); $sql_array['WHERE'] .= 'AND t.forum_id = ' . (int) $this->forum_id; } |