diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-26 10:25:10 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-06-26 10:25:10 +0200 |
| commit | 9e117a9eeb1958c7a8155c2e4912d4e3537f3dee (patch) | |
| tree | a823aef82ab1d8cef009f024e32dfa3d60ce0eb8 | |
| parent | 8747c7a2c17e2f5408f528f5213a3e056aefd54e (diff) | |
| parent | 7d7b536874aa7eae7a6c5451d1ed8ee1dc62a1df (diff) | |
| download | forums-9e117a9eeb1958c7a8155c2e4912d4e3537f3dee.tar forums-9e117a9eeb1958c7a8155c2e4912d4e3537f3dee.tar.gz forums-9e117a9eeb1958c7a8155c2e4912d4e3537f3dee.tar.bz2 forums-9e117a9eeb1958c7a8155c2e4912d4e3537f3dee.tar.xz forums-9e117a9eeb1958c7a8155c2e4912d4e3537f3dee.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/includes/mcp/mcp_post.php
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index f7983c57bf..00cdc03f14 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -461,7 +461,7 @@ function mcp_post_details($id, $mode, $action) */ function change_poster(&$post_info, $userdata) { - global $auth, $db, $config, $phpbb_root_path, $phpEx, $user, $phpbb_log; + global $auth, $db, $config, $phpbb_root_path, $phpEx, $user, $phpbb_log, $phpbb_dispatcher; if (empty($userdata) || $userdata['user_id'] == $post_info['user_id']) { |