diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-08-18 17:43:24 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-08-18 17:43:24 -0400 |
| commit | 6330153937b9321ce71226a7692403b64ad8e0c7 (patch) | |
| tree | e101452e3b8a05343aec9a6ca220c740217e6390 | |
| parent | a91131c55e468811ac6ce4abf637c755b83e0caa (diff) | |
| parent | 49c89023fcc946ed8c81181fabfea164128d8d5a (diff) | |
| download | forums-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.
| -rw-r--r-- | phpBB/index.php | 2 | ||||
| -rw-r--r-- | phpBB/memberlist.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_view.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/memberlist_view.html | 4 |
4 files changed, 5 insertions, 5 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); 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)); } } diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index 031bfec6ff..3398bb5e9e 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -28,7 +28,7 @@ <!-- ENDIF --> <!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}:</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF --> <!-- IF LOCATION --><dt>{L_LOCATION}:</dt> <dd>{LOCATION}</dd><!-- ENDIF --> - <!-- IF AGE --><dt>{L_AGE}:</dt> <dd>{AGE}</dd><!-- ENDIF --> + <!-- IF AGE !== '' --><dt>{L_AGE}:</dt> <dd>{AGE}</dd><!-- ENDIF --> <!-- IF OCCUPATION --><dt>{L_OCCUPATION}:</dt> <dd>{OCCUPATION}</dd><!-- ENDIF --> <!-- IF INTERESTS --><dt>{L_INTERESTS}:</dt> <dd>{INTERESTS}</dd><!-- ENDIF --> <!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}:</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html index 9ef2b85878..0afa750c79 100644 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ b/phpBB/styles/subsilver2/template/memberlist_view.html @@ -148,10 +148,10 @@ <td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_LOCATION}: </td> <td><!-- IF LOCATION --><b class="genmed">{LOCATION}</b><!-- ENDIF --></td> </tr> - <!-- IF AGE --> + <!-- IF AGE !== '' --> <tr> <td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_AGE}: </td> - <td><b class="genmed"><!-- IF AGE -->{AGE}<!-- ELSE --> - <!-- ENDIF --></b></td> + <td><b class="genmed">{AGE}</b></td> </tr> <!-- ENDIF --> <tr> |