diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-15 02:15:16 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-15 02:15:16 -0400 |
| commit | 52c4726b5b8bf762b56d0fa06b24e09003d74811 (patch) | |
| tree | 340a839f2a9c6b4e957b83d3b9e482fc6dbf7995 /phpBB/styles | |
| parent | 457758ef4a8382a233e433a86545f35e0ad341a9 (diff) | |
| parent | 6aa2f9e7422c41193294c871913867ee42dc34a0 (diff) | |
| download | forums-52c4726b5b8bf762b56d0fa06b24e09003d74811.tar forums-52c4726b5b8bf762b56d0fa06b24e09003d74811.tar.gz forums-52c4726b5b8bf762b56d0fa06b24e09003d74811.tar.bz2 forums-52c4726b5b8bf762b56d0fa06b24e09003d74811.tar.xz forums-52c4726b5b8bf762b56d0fa06b24e09003d74811.zip | |
Merge remote-tracking branch 'bantu/ticket/10173' into develop
* bantu/ticket/10173:
[ticket/10173] Use correct variable, checking for $birthday_year was correct.
[ticket/10173] Only calculate age if year is not false as per nn-.
[ticket/10173] Use an array for the legacy birthday list as per rxu.
[ticket/10173] Use a loop var for the birthdays list to allow proper templating
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/index_body.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/index_body.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 539c851d1d..b183cf4372 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -35,9 +35,9 @@ <!-- IF LEGEND --><br /><em>{L_LEGEND}: {LEGEND}</em><!-- ENDIF --></p> <!-- ENDIF --> -<!-- IF S_DISPLAY_BIRTHDAY_LIST and BIRTHDAY_LIST --> +<!-- IF S_DISPLAY_BIRTHDAY_LIST and .birthdays --> <h3>{L_BIRTHDAYS}</h3> - <p><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <strong>{BIRTHDAY_LIST}</strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p> + <p><!-- IF .birthdays -->{L_CONGRATULATIONS}: <strong><!-- BEGIN birthdays -->{birthdays.USERNAME}<!-- IF birthdays.AGE !== '' --> ({birthdays.AGE})<!-- ENDIF --><!-- IF not birthdays.S_LAST_ROW -->, <!-- ENDIF --><!-- END birthdays --></strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p> <!-- ENDIF --> <!-- IF NEWEST_USER --> diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index e52e357564..100199c209 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -50,7 +50,7 @@ </tr> <tr> <td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_BIRTHDAYS}" /></td> - <td class="row1" width="100%"><p class="genmed"><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <b>{BIRTHDAY_LIST}</b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p></td> + <td class="row1" width="100%"><p class="genmed"><!-- IF .birthdays -->{L_CONGRATULATIONS}: <b><!-- BEGIN birthdays -->{birthdays.USERNAME}<!-- IF birthdays.AGE !== '' --> ({birthdays.AGE})<!-- ENDIF --><!-- IF not birthdays.S_LAST_ROW -->, <!-- ENDIF --><!-- END birthdays --></b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p></td> </tr> </table> <!-- ENDIF --> |