Merge branch 'master' of git://git.neuf.no/inside

This commit is contained in:
root@amen committed 2013-08-29 06:23:01 +02:00
commit 772748928d
2 files changed
+11 -4

No files matched your search

+3 -3
View File
@@ -615,14 +615,14 @@ class Page {
if (!isActive()){?>
<?php
if (!isMember()){?>
<p><a href="index.php?page=register-membership">Registrér eller kjøp medlemskap</a></p>
<a class="btn btn-primary" href="index.php?page=register-membership">Registrér eller kjøp medlemskap</a>
<?php
}else if (membershipExpired(getCurrentUser())){?>
<p><a href="index.php?page=register-membership">Registrér eller kjøp medlemskap</a></p>
<a class="btn btn-primary" href="index.php?page=register-membership">Registrér eller kjøp medlemskap</a>
<?php
}
?>
<p><a href="index.php?page=display-current-user">Oppdatér din brukerinformasjon</a></p>
<a class="btn" href="index.php?page=display-current-user">Oppdatér brukerinfo</a>
<?php
} else {