forums/phpBB/phpbb/feed/topics.php, branch master

Merge branch '3.1.x' into 3.2.x

2017-01-04T16:44:11+00:00

[ticket/14838] Do not query full attachments table in feeds

2017-01-03T21:56:42+00:00

The fetch_attachments() will also now throw a runtime exception if a feed
tries to do this nonetheless.

PHPBB3-14838

[ticket/13645] Proper OOP for feeds

2015-08-23T20:36:10+00:00

PHPBB3-13645

[ticket/12966] Sort by post_time and post_id where applicable

2014-08-23T14:36:39+00:00

This change was not applied to the search as this would require a larger
rewrite of the search methods.

PHPBB3-12966

[ticket/12594] Remove @package tags and update file headers

2014-05-27T18:51:13+00:00

PHPBB3-12594

[ticket/12459] Fix: Soft deleted topics should appear in feeds

2014-05-04T13:44:12+00:00

As for the posts, a soft deleted topic should appear (with a corresponding
message) in topic's based feeds.

PHPBB3-12459

Merge branch 'develop' into ticket/11271-develop

2013-12-26T18:58:38+00:00

# By Vjacheslav Trushkin (148) and others
# Via Joas Schilling (50) and others
* develop: (635 commits)
  [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().
  [ticket/11849] Fix more function calls
  [ticket/11849] Update more MCP calls to pagination class
  [ticket/11849] Update some ACP modules with new pagination
  [ticket/11849] Update rest of the UCP modules
  [ticket/11849] Update UCP notifications and pm folder
  [ticket/11849] Update search and memberlist
  [ticket/11849] Update pagination in viewonline.php
  [ticket/11849] Remove old pagination test
  [ticket/11849] Update pagination code in viewtopic.php
  [ticket/11849] Replace pagination in viewforum.php with class
  [ticket/11849] Add service definition
  [ticket/11849] Remove pagination functions
  [ticket/11849] Test validate_start and on_page
  [ticket/11849] Move pagination code to class
  [ticket/12060] A little less verbose cleanup of event docblocks
  [ticket/12060] Further clarifying new event docblocks as much as possible
  [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
  [ticket/12060] Remove whitespaces
  [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
  ...

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30T12:05:28+00:00

PHPBB3-11980

Merge branch 'ticket/11271' into ticket/11271-develop

2013-10-05T11:24:09+00:00

# By erangamapa (7) and Dhruv (2)
* ticket/11271:
  [ticket/11271] Typecast forum and topic id to integer
  [ticket/11271] Use absolute path for displaying inline attachments in feeds
  [ticket/11271] Changed executable bit.
  [ticket/11271] Formatting code and removing null assignment.
  [ticket/11271] Removing unnecessary database object
  [ticket/11271] Separated attachment fetching query
  [ticket/11271] Fetched feed attachments before loop.
  [ticket/11271] Removed in-line attachment comments properly.
  [ticket/11271] Displaying in-line attached images in ATOM feed.

Conflicts:
	phpBB/feed.php

[ticket/11700] Move all recent code to namespaces

2013-09-15T22:25:27+00:00

PHPBB3-11700