aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/memberlist.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-08-18 17:43:24 -0400
committerNils Adermann <naderman@naderman.de>2011-08-18 17:43:24 -0400
commit6330153937b9321ce71226a7692403b64ad8e0c7 (patch)
treee101452e3b8a05343aec9a6ca220c740217e6390 /phpBB/memberlist.php
parenta91131c55e468811ac6ce4abf637c755b83e0caa (diff)
parent49c89023fcc946ed8c81181fabfea164128d8d5a (diff)
downloadforums-6330153937b9321ce71226a7692403b64ad8e0c7.tar
forums-6330153937b9321ce71226a7692403b64ad8e0c7.tar.gz
forums-6330153937b9321ce71226a7692403b64ad8e0c7.tar.bz2
forums-6330153937b9321ce71226a7692403b64ad8e0c7.tar.xz
forums-6330153937b9321ce71226a7692403b64ad8e0c7.zip
Merge remote-tracking branch 'github-bantu/ticket/8571' into develop-olympus
* github-bantu/ticket/8571: [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/memberlist.php')
-rw-r--r--phpBB/memberlist.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 351759fcbd..8169ee7a3e 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1697,7 +1697,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
$diff = ($diff < 0) ? 1 : 0;
}
- $age = (int) ($now['year'] - $bday_year - $diff);
+ $age = max(0, (int) ($now['year'] - $bday_year - $diff));
}
}