mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-16 12:29:43 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1884 from nickvergessen/ticket/12015-2

Browse Source 
[ticket/12015] Fix variable name and event version
This commit is contained in:
Nathan Guse 2013-11-21 14:56:05 -08:00
commit 6e842f11fc
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/viewtopic.php
View File

@ -1689,12 +1689,14 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
$user_poster_data = $user_cache[$poster_id]; $user_poster_data = $user_cache[$poster_id];
$current_row_number = $i;
/** /**
* Modify the posts template block * Modify the posts template block
* *
* @event core.viewtopic_modify_post_row * @event core.viewtopic_modify_post_row
* @var int start Start item of this page * @var int start Start item of this page
* @var int i Number of the post on this page * @var int current_row_number Number of the post on this page
* @var int end Number of posts on this page * @var int end Number of posts on this page
* @var array row Array with original post and user data * @var array row Array with original post and user data
* @var array cp_row Custom profile field data of the poster * @var array cp_row Custom profile field data of the poster
@ -1702,11 +1704,13 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
* @var array user_poster_data Poster's data from user cache * @var array user_poster_data Poster's data from user cache
* @var array post_row Template block array of the post * @var array post_row Template block array of the post
* @since 3.1-A1 * @since 3.1-A1
* @change 3.1.0-a2 Added vars start, i, end, and attachments * @change 3.1.0-a3 Added vars start, current_row_number, end, attachments
*/ */
$vars = array('start', 'i', 'end', 'row', 'cp_row', 'attachments', 'user_poster_data', 'post_row'); $vars = array('start', 'current_row_number', 'end', 'row', 'cp_row', 'attachments', 'user_poster_data', 'post_row');
extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_post_row', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_post_row', compact($vars)));
$i = $current_row_number;
if (isset($cp_row['row']) && sizeof($cp_row['row'])) if (isset($cp_row['row']) && sizeof($cp_row['row']))
{ {
$post_row = array_merge($post_row, $cp_row['row']); $post_row = array_merge($post_row, $cp_row['row']);
@ -1740,23 +1744,27 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
} }
} }
$current_row_number = $i;
/** /**
* Event after the post data has been assigned to the template * Event after the post data has been assigned to the template
* *
* @event core.viewtopic_post_row_after * @event core.viewtopic_post_row_after
* @var int start Start item of this page * @var int start Start item of this page
* @var int i Number of the post on this page * @var int current_row_number Number of the post on this page
* @var int end Number of posts on this page * @var int end Number of posts on this page
* @var array row Array with original post and user data * @var array row Array with original post and user data
* @var array cp_row Custom profile field data of the poster * @var array cp_row Custom profile field data of the poster
* @var array attachments List of attachments * @var array attachments List of attachments
* @var array user_poster_data Poster's data from user cache * @var array user_poster_data Poster's data from user cache
* @var array post_row Template block array of the post * @var array post_row Template block array of the post
* @since 3.1.0-a2 * @since 3.1.0-a3
*/ */
$vars = array('start', 'i', 'end', 'row', 'cp_row', 'attachments', 'user_poster_data', 'post_row'); $vars = array('start', 'current_row_number', 'end', 'row', 'cp_row', 'attachments', 'user_poster_data', 'post_row');
extract($phpbb_dispatcher->trigger_event('core.viewtopic_post_row_after', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.viewtopic_post_row_after', compact($vars)));
$i = $current_row_number;
$prev_post_id = $row['post_id']; $prev_post_id = $row['post_id'];
unset($rowset[$post_list[$i]]); unset($rowset[$post_list[$i]]);