mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-25 09:30:46 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
Dhruv
2013-10-05 16:54:09 +05:30
parent e8c7f8134d c73801242d
commit 7a971f896d
9 changed files with 63 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/phpbb/feed/helper.php
View File

@@ -90,7 +90,7 @@ class helper
/**
* Generate text content
*/
public function generate_content($content, $uid, $bitfield, $options)
public function generate_content($content, $uid, $bitfield, $options, $forum_id, $post_attachments)
{
if (empty($content))
{
@@ -137,8 +137,15 @@ class helper
// Remove some specials html tag, because somewhere there are a mod to allow html tags ;)
$content = preg_replace( '#<(script|iframe)([^[]+)\1>#siU', ' <strong>$1</strong> ', $content);
// Parse inline images to display with the feed
if (count($post_attachments) > 0)
{
$update_count = array();
parse_attachments($forum_id, $content, $post_attachments, $update_count);
}
// Remove Comments from inline attachments [ia]
$content = preg_replace('#<div class="(inline-attachment|attachtitle)">(.*?)<!-- ia(.*?) -->(.*?)<!-- ia(.*?) -->(.*?)</div>#si','$4',$content);
$content = preg_replace('#<dd>(.*?)</dd>#','',$content);
// Replace some entities with their unicode counterpart
$entities = array(
@@ -156,6 +163,9 @@ class helper
// Other control characters
$content = preg_replace('#(?:[\x00-\x1F\x7F]+|(?:\xC2[\x80-\x9F])+)#', '', $content);
// Convert attachments' relative path to absolute path
$content = str_replace($this->phpbb_root_path . 'download', $this->get_board_url() . '/download', $content);
return $content;
}
}