diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-03-12 10:11:52 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-03-12 10:11:52 +0100 |
| commit | ba6943a6a0ea50af772dc6e94f13b56292cd9f37 (patch) | |
| tree | 99bb259ddc61680778df8c6c9dff798454267c5b /phpBB/includes | |
| parent | 45f39c6d1f2adc318d521bd9eb75d80f0750fdb8 (diff) | |
| download | forums-ba6943a6a0ea50af772dc6e94f13b56292cd9f37.tar forums-ba6943a6a0ea50af772dc6e94f13b56292cd9f37.tar.gz forums-ba6943a6a0ea50af772dc6e94f13b56292cd9f37.tar.bz2 forums-ba6943a6a0ea50af772dc6e94f13b56292cd9f37.tar.xz forums-ba6943a6a0ea50af772dc6e94f13b56292cd9f37.zip | |
[ticket/10605] Prefix function with phpbb_ and use true instead of 1
PHPBB3-10605
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 30cff8ed72..34f16ea9da 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1086,7 +1086,7 @@ function delete_pm($user_id, $msg_ids, $folder_id) /** * Delete all PM(s) for a given user and delete the ones without references */ -function delete_user_pms($user_id) +function phpbb_delete_user_pms($user_id) { global $db, $user, $phpbb_root_path, $phpEx; @@ -1116,7 +1116,7 @@ function delete_user_pms($user_id) $undelivered_user[$row['user_id']][] = true; } - $delete_rows[$row['msg_id']] = 1; + $delete_rows[$row['msg_id']] = true; } $db->sql_freeresult($result); diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 20923ea495..92a7b8e0e9 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -529,11 +529,11 @@ function user_delete($mode, $user_id, $post_username = false) $db->sql_query($sql); // Clean the private messages tables from the user - if (!function_exists('delete_user_pms')) + if (!function_exists('phpbb_delete_user_pms')) { include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx); } - delete_user_pms($user_id); + phpbb_delete_user_pms($user_id); $db->sql_transaction('commit'); |