Andreas Fischer cc13bac412 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

2012-03-22 18:15:10 +01:00

..

acp

[task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.

2012-03-16 04:56:41 -04:00

auth

…

cache

…

captcha

…

config

…

cron

…

db

…

diff

…

extension

…

hooks

…

lock

…

mcp

Merge branch 'develop-olympus' into develop

2012-03-16 06:18:35 -04:00

questionnaire

…

request

…

search

…

template

…

ucp

…

utf

…

.htaccess

…

auth.php

…

bbcode.php

…

class_loader.php

…

constants.php

…

error_collector.php

…

functions_acp.php

…

functions_admin.php

…

functions_compress.php

…

functions_content.php

…

functions_convert.php

…

functions_display.php

…

functions_download.php

…

functions_install.php

…

functions_jabber.php

…

functions_messenger.php

…

functions_module.php

Merge remote-tracking branch 'dhruvgoel92/ticket/10704' into develop

2012-03-22 10:59:41 +01:00

functions_posting.php

Merge branch 'develop-olympus' into develop

2012-03-22 18:15:10 +01:00

functions_privmsgs.php

Merge branch 'develop-olympus' into develop

2012-03-22 18:15:10 +01:00

functions_profile_fields.php

Merge branch 'develop-olympus' into develop

2012-03-09 05:55:56 -05:00

functions_transfer.php

…

functions_upload.php

…

functions_user.php

Merge branch 'develop-olympus' into develop

2012-03-22 18:15:10 +01:00

functions.php

…

group_positions.php

…

index.htm

…

message_parser.php

…

session.php

…

startup.php

Merge branch 'develop-olympus' into develop

2012-03-22 10:51:03 +01:00