From edcea678a67333aa398b7be371b2d726edc1a23b Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 20 Mar 2010 16:12:14 +0100
Subject: [PATCH] Fix useless SQL queries when on Xnet but not in a group.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 classes/platalglobals.php.in | 4 +++-
 core                         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/platalglobals.php.in b/classes/platalglobals.php.in
index aabdac3..774a809 100644
--- a/classes/platalglobals.php.in
+++ b/classes/platalglobals.php.in
@@ -52,15 +52,17 @@ class PlatalGlobals extends PlGlobals
 
     public function asso($key = null)
     {
+        static $fetched = false;
         static $aid = null;
 
-        if (isset($GLOBALS['IS_XNET_SITE']) && is_null($aid)) {
+        if (isset($GLOBALS['IS_XNET_SITE']) && !$fetched) {
             $gp = Get::v('n');
             if ($p = strpos($gp, '/')) {
                 $gp = substr($gp, 0, $p);
             }
 
             $aid = Group::get($gp);
+            $fetched = true;
         }
         if (empty($key)) {
             return $aid;
diff --git a/core b/core
index fd669a5..9d421b2 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit fd669a5756eb8607006d19575956a2f6ea1508ce
+Subproject commit 9d421b2930b5cd1b70dbbe5d11ad3c8c4197faa5
-- 
2.1.4