mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-04 11:41:38 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786

Browse Source
This commit is contained in:
rechosen
2013-09-23 18:08:29 +02:00
parent 564a7cc89d 717e2337b9
commit e45b69ee09
241 changed files with 8066 additions and 5562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/viewtopic.php
View File

@@ -1012,7 +1012,7 @@ while ($row = $db->sql_fetchrow($result))
}
}
$rowset[$row['post_id']] = array(
$rowset_data = array(
'hide_post' => (($row['foe'] || $row['post_visibility'] == ITEM_DELETED) && ($view != 'show' || $post_id != $row['post_id'])) ? true : false,
'post_id' => $row['post_id'],
@@ -1047,6 +1047,19 @@ while ($row = $db->sql_fetchrow($result))
'foe' => $row['foe'],
);
/**
* Modify the post rowset containing data to be displayed with posts
*
* @event core.viewtopic_post_rowset_data
* @var array rowset_data Array with the rowset data for this post
* @var array row Array with original user and post data
* @since 3.1-A1
*/
$vars = array('rowset_data', 'row');
extract($phpbb_dispatcher->trigger_event('core.viewtopic_post_rowset_data', compact($vars)));
$rowset[$row['post_id']] = $rowset_data;
// Define the global bbcode bitfield, will be used to load bbcodes
$bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']);