From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 1 Jun 2008 10:28:16 +0000 (+0200)
Subject: Merge branch 'platal-0.9.16'
X-Git-Tag: core/1.0.0~161
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=afada5eb6cf23005f775fbab0d421c27393172f1;p=platal.git

Merge branch 'platal-0.9.16'

Conflicts:

	modules/auth/auth.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

afada5eb6cf23005f775fbab0d421c27393172f1
diff --cc modules/auth/auth.inc.php
index 9f30d32,1b01a77..305e0fc
--- a/modules/auth/auth.inc.php
+++ b/modules/auth/auth.inc.php
@@@ -62,12 -62,9 +62,9 @@@ function gpex_make($chlg, $privkey, $da
                                      WHERE  uid = {?} AND diminutif = {?}",
                                    S::v('uid'), $_GET['group']);
                  $perms = $res->fetchOneCell();
-                 if (S::has_perms()) {
-                     $perms = 'admin';
-                 }
              } else {
                  // if no group asked, return main rights
 -                $perms = Session::has_perms()?'admin':'membre';
 +                $perms = S::has_perms() ? 'admin' : 'membre';
              }
              $params .= gpex_prepare_param($val, $perms, $tohash, $charset);
          }