diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-08-21 14:11:06 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-08-21 14:11:06 +0200 |
| commit | 15d0fe7d9feae915a0ec6a8e63e8ac955bedae60 (patch) | |
| tree | f234de71b1cfeb2ce56223f78149c6437f094410 /phpBB/index.php | |
| parent | 106cec9a92abd55cb3944f482001d32e15a7835c (diff) | |
| parent | 1680b3a2a7614fb35d9119652140db2ff8bf5b0e (diff) | |
| download | forums-15d0fe7d9feae915a0ec6a8e63e8ac955bedae60.tar forums-15d0fe7d9feae915a0ec6a8e63e8ac955bedae60.tar.gz forums-15d0fe7d9feae915a0ec6a8e63e8ac955bedae60.tar.bz2 forums-15d0fe7d9feae915a0ec6a8e63e8ac955bedae60.tar.xz forums-15d0fe7d9feae915a0ec6a8e63e8ac955bedae60.zip | |
Merge branch 'develop-olympus' of git://github.com/phpbb/phpbb3 into develop-olympus
* 'develop-olympus' of git://github.com/phpbb/phpbb3:
[ticket/9978] Added semicolons to JavaScript in overall_header.
[ticket/8571] Show age as 0 in birthday list when birthday is in the future.
[ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
[ticket/8571] Also display age on memberlist/viewprofile when age is 0.
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 3b58646af0..91cbd326b9 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -99,7 +99,7 @@ if ($config['load_birthdays'] && $config['allow_birthdays']) if ($age = (int) substr($row['user_birthday'], -4)) { - $birthday_list .= ' (' . ($now['year'] - $age) . ')'; + $birthday_list .= ' (' . max(0, $now['year'] - $age) . ')'; } } $db->sql_freeresult($result); |