aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-09-25 15:59:50 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-09-25 15:59:50 +0200
commit2c92123ca59d044c33de3d8e04b02451b008670d (patch)
tree10b954eba787dd24c6752fbeddbc9922d3ac8d58
parent717e2337b9276d9f9680110dff552ea536d0723c (diff)
downloadforums-2c92123ca59d044c33de3d8e04b02451b008670d.tar
forums-2c92123ca59d044c33de3d8e04b02451b008670d.tar.gz
forums-2c92123ca59d044c33de3d8e04b02451b008670d.tar.bz2
forums-2c92123ca59d044c33de3d8e04b02451b008670d.tar.xz
forums-2c92123ca59d044c33de3d8e04b02451b008670d.zip
[ticket/11862] Correct var names in user_delete() events due to prune-users
The prune-users feature modified the names of the used variables in this function. However, the variable names for the two events in this function were not changed to reflect that. This patch will take care of it. PHPBB3-11862
-rw-r--r--phpBB/includes/functions_user.php18
1 files changed, 10 insertions, 8 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 4fcce67801..383a0b9d97 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -388,12 +388,13 @@ function user_delete($mode, $user_ids, $retain_username = true)
* Event before a user is deleted
*
* @event core.delete_user_before
- * @var string mode Mode of deletion (retain/delete posts)
- * @var int user_id ID of the deleted user
- * @var mixed post_username Guest username that is being used or false
+ * @var string mode Mode of deletion (retain/delete posts)
+ * @var int user_ids IDs of the deleted user
+ * @var mixed retain_username True if username should be retained
+ * or false if not
* @since 3.1-A1
*/
- $vars = array('mode', 'user_id', 'post_username');
+ $vars = array('mode', 'user_ids', 'retain_username');
extract($phpbb_dispatcher->trigger_event('core.delete_user_before', compact($vars)));
// Before we begin, we will remove the reports the user issued.
@@ -616,12 +617,13 @@ function user_delete($mode, $user_ids, $retain_username = true)
* Event after a user is deleted
*
* @event core.delete_user_after
- * @var string mode Mode of deletion (retain/delete posts)
- * @var int user_id ID of the deleted user
- * @var mixed post_username Guest username that is being used or false
+ * @var string mode Mode of deletion (retain/delete posts)
+ * @var int user_id IDs of the deleted user
+ * @var mixed retain_username True if username should be retained
+ * or false if not
* @since 3.1-A1
*/
- $vars = array('mode', 'user_id', 'post_username');
+ $vars = array('mode', 'user_ids', 'retain_username');
extract($phpbb_dispatcher->trigger_event('core.delete_user_after', compact($vars)));
// Reset newest user info if appropriate