Merge 425e148ee5 into a12c77083b

Web/Presenters/templates/User/View.xml

@@ -458,11 +458,9 @@
                         </tr>
                         <tr n:if="!is_null($user->getBirthday())">
                             <td class="label"><span class="nobold">{_birth_date}:</span></td>
-			    			{if $user->onlineStatus() != 2 && $user->getBirthdayPrivacy() == 0}
+			    <td n:if="$user->getBirthdayPrivacy() == 0 && $user->onlineStatus() == 2" class="data">{$user->getBirthday()->format('%e %B %Y')}</td>
-                            <td class="data">{$user->getBirthday()->format('%e %B %Y')},
+                            <td n:if="$user->getBirthdayPrivacy() == 0 && $user->onlineStatus() != 2" class="data">{$user->getBirthday()->format('%e %B %Y')},
                                 {tr("years", $user->getAge())}</td>
-							{/if}
-							<td n:if="$user->onlineStatus() == 2" class="data">{$user->getBirthday()->format('%e %B %Y')}</td>
                             <td n:if="$user->getBirthdayPrivacy() == 1" class="data">{$user->getBirthday()->format('%e %B')}</td>
                         </tr>
                     </tbody>