php-phpbb

mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 21:44:57 +02:00

History

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

* ticket/11271:
  [ticket/11271] Add docblock of feed_generate_content( )
  [ticket/11271] Fix tabs and use !empty( ) instead of count( )
  [ticket/11271] Remove unnecessary inclusion of functions_display
  [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

2013-12-27 01:33:32 +05:30

base.php

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

2013-10-30 13:05:28 +01:00

factory.php

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

2013-10-30 13:05:28 +01:00

forum.php

Merge branch 'develop' into ticket/11271-develop

2013-12-27 00:28:38 +05:30

forums.php

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