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

This commit is contained in:
root@amen committed 2013-08-29 06:56:51 +02:00
commit 1510988d3d
1 file changed
+2 -2
+2 -2
View File
@@ -584,7 +584,7 @@ class Page {
?>
<div class="text-column">
<?php $user->membershipStatus(); ?>
<?php echo $user->membershipStatus(); ?>
<?php
if (!membershipNextYear(getCurrentUser())) {
@@ -2414,7 +2414,7 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
}
$user = new User($userId);
$user->membershipStatus();
echo $user->membershipStatus();
if (checkAuth("perform-update-user") || $tag == "current-" || checkResponsible()){
$readonly = false;