diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-11-12 08:50:18 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-11-12 08:50:18 +0100 |
| commit | 8398e0700aebf24a77c78be1d64b0a5b4a8b4c96 (patch) | |
| tree | de62de0f28fc050a86e8fbe6cc6adbc2bb83de62 /phpBB/includes | |
| parent | 13133b359bfce9c6f303faa00cb22171620c1d20 (diff) | |
| parent | 08739751b211c147b58a80a55f3bbde00a96e005 (diff) | |
| download | forums-8398e0700aebf24a77c78be1d64b0a5b4a8b4c96.tar forums-8398e0700aebf24a77c78be1d64b0a5b4a8b4c96.tar.gz forums-8398e0700aebf24a77c78be1d64b0a5b4a8b4c96.tar.bz2 forums-8398e0700aebf24a77c78be1d64b0a5b4a8b4c96.tar.xz forums-8398e0700aebf24a77c78be1d64b0a5b4a8b4c96.zip | |
Merge pull request #3910 from kinerity/ticket/14170
[ticket/14170] Fix mcp_change_poster_after event
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 7a93f73228..2dcfcd608b 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -549,16 +549,6 @@ function change_poster(&$post_info, $userdata) $from_username = $post_info['username']; $to_username = $userdata['username']; - // Renew post info - $post_info = phpbb_get_post_data(array($post_id), false, true); - - if (!sizeof($post_info)) - { - trigger_error('POST_NOT_EXIST'); - } - - $post_info = $post_info[$post_id]; - /** * This event allows you to perform additional tasks after changing a post's poster * @@ -566,10 +556,21 @@ function change_poster(&$post_info, $userdata) * @var array userdata Information on a post's new poster * @var array post_info Information on the affected post * @since 3.1.6-RC1 + * @changed 3.1.7-RC1 Change location to prevent post_info from being set to the new post information */ $vars = array('userdata', 'post_info'); extract($phpbb_dispatcher->trigger_event('core.mcp_change_poster_after', compact($vars))); + // Renew post info + $post_info = phpbb_get_post_data(array($post_id), false, true); + + if (!sizeof($post_info)) + { + trigger_error('POST_NOT_EXIST'); + } + + $post_info = $post_info[$post_id]; + // Now add log entry add_log('mod', $post_info['forum_id'], $post_info['topic_id'], 'LOG_MCP_CHANGE_POSTER', $post_info['topic_title'], $from_username, $to_username); } |