diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-08-30 01:41:41 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-08-30 01:41:41 +0200 |
| commit | bf4eb6d06c0f87154b31466df3583d3e690e6830 (patch) | |
| tree | 3d2527e7a7d42aba411051f6fad2188efe410444 /phpBB/index.php | |
| parent | 57f7c2480686a54b6f01d2f53ce64c0f2d34758b (diff) | |
| parent | 1daefc6177eef8da8600d35fa4dafb7f8f00bf4b (diff) | |
| download | forums-bf4eb6d06c0f87154b31466df3583d3e690e6830.tar forums-bf4eb6d06c0f87154b31466df3583d3e690e6830.tar.gz forums-bf4eb6d06c0f87154b31466df3583d3e690e6830.tar.bz2 forums-bf4eb6d06c0f87154b31466df3583d3e690e6830.tar.xz forums-bf4eb6d06c0f87154b31466df3583d3e690e6830.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10334] Require permissions to view the birthday-list on board index
Conflicts:
phpBB/index.php
Diffstat (limited to 'phpBB/index.php')
| -rw-r--r-- | phpBB/index.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/index.php b/phpBB/index.php index b7079d3e88..182efbc7e0 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -82,7 +82,7 @@ $legend = implode(', ', $legend); // Generate birthday list if required ... $birthday_list = array(); -if ($config['load_birthdays'] && $config['allow_birthdays']) +if ($config['load_birthdays'] && $config['allow_birthdays'] && $auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) { $now = phpbb_gmgetdate(time() + $user->timezone + $user->dst); |