diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-21 14:56:05 -0800 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-21 14:56:05 -0800 |
| commit | 6e842f11fcd6c0155b0833039c81c0fd32ace545 (patch) | |
| tree | 4a037ac29f896920653611a1ebad2fd42869946c | |
| parent | 5220013f9da1b317aa2961196323c08c70b1df24 (diff) | |
| parent | 2a154d0a1065b55bfc1cadcd2c460ddb9b95dd69 (diff) | |
| download | forums-6e842f11fcd6c0155b0833039c81c0fd32ace545.tar forums-6e842f11fcd6c0155b0833039c81c0fd32ace545.tar.gz forums-6e842f11fcd6c0155b0833039c81c0fd32ace545.tar.bz2 forums-6e842f11fcd6c0155b0833039c81c0fd32ace545.tar.xz forums-6e842f11fcd6c0155b0833039c81c0fd32ace545.zip | |
Merge pull request #1884 from nickvergessen/ticket/12015-2
[ticket/12015] Fix variable name and event version
| -rw-r--r-- | phpBB/viewtopic.php | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 358dd56de2..a182268a71 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1689,12 +1689,14 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) $user_poster_data = $user_cache[$poster_id]; + $current_row_number = $i; + /** * Modify the posts template block * * @event core.viewtopic_modify_post_row * @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 array row Array with original post and user data * @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 post_row Template block array of the post * @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))); + $i = $current_row_number; + if (isset($cp_row['row']) && sizeof($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 core.viewtopic_post_row_after * @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 array row Array with original post and user data * @var array cp_row Custom profile field data of the poster * @var array attachments List of attachments * @var array user_poster_data Poster's data from user cache * @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))); + $i = $current_row_number; + $prev_post_id = $row['post_id']; unset($rowset[$post_list[$i]]); |