diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-03-22 18:15:10 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-03-22 18:15:10 +0100 |
| commit | cc13bac412442a1d72affcc3222b6bfca094e92a (patch) | |
| tree | 52bb477441ad8eea535681910ed15cebcc9cfca9 /phpBB/includes/auth.php | |
| parent | 81310f93517d50d27196b6aa1051ad3b87b5e689 (diff) | |
| parent | 57eb50812f138296085b51b74079037c2efe1c43 (diff) | |
| download | forums-cc13bac412442a1d72affcc3222b6bfca094e92a.tar forums-cc13bac412442a1d72affcc3222b6bfca094e92a.tar.gz forums-cc13bac412442a1d72affcc3222b6bfca094e92a.tar.bz2 forums-cc13bac412442a1d72affcc3222b6bfca094e92a.tar.xz forums-cc13bac412442a1d72affcc3222b6bfca094e92a.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10684] Adjust function and parameter name, minor changes.
[ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
[ticket/10684] Remove intval mapping for array keys
[ticket/10684] Adjust pm_notifications() to handle stale bans
[ticket/10684] Cast user_id to integer
[ticket/10684] Refactor $sql_ignore_users array update
[ticket/10684] Remove isset() for $sql_ignore_users update
[ticket/10684] Fix 2 typos in comment lines.
[ticket/10684] Send notifications for users with stale bans
Conflicts:
phpBB/includes/functions_user.php
Diffstat (limited to 'phpBB/includes/auth.php')
0 files changed, 0 insertions, 0 deletions