From faeb823b5ddb8e2613cfef9fd15b86a5d9a37890 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 21 Mar 2010 21:35:54 +0100
Subject: [PATCH] Fix issues with logger instantiation.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 classes/platal.php   | 6 +++---
 classes/pllogger.php | 8 --------
 classes/s.php        | 5 +++--
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/classes/platal.php b/classes/platal.php
index a9376cd..2d988bc 100644
--- a/classes/platal.php
+++ b/classes/platal.php
@@ -41,7 +41,7 @@ abstract class Platal
     public function __construct()
     {
         global $platal, $session, $globals;
-        $platal  =& $this;
+        $platal  = $this;
 
         /* Assign globals first, then call init: init must be used for operations
          * that requires access to the content of $globals (e.g. XDB requires
@@ -391,13 +391,13 @@ abstract class Platal
         }
     }
 
-    public function &buildLogger($uid, $suid)
+    public function &buildLogger($uid, $suid = 0)
     {
         if (defined('PL_LOGGER_CLASS')) {
             $class = PL_LOGGER_CLASS;
             return new $class($uid, $suid);
         } else {
-            return new DummyLogger($uid, $suid);
+            return PlLogger::dummy($uid, $suid);
         }
     }
 
diff --git a/classes/pllogger.php b/classes/pllogger.php
index 77eb97f..87ef69b 100644
--- a/classes/pllogger.php
+++ b/classes/pllogger.php
@@ -43,14 +43,6 @@ abstract class PlLogger
      */
     abstract public function isValid($uid);
 
-    /** Build a logger.
-     */
-    public static function get($uid, $suid = 0)
-    {
-        global $platal;
-        return $platal->buildLogger($uid, $suid);
-    }
-
     /** Return a dummy logger.
      */
     public static function dummy($uid, $suid = 0) {
diff --git a/classes/s.php b/classes/s.php
index 346f3be..9f71872 100644
--- a/classes/s.php
+++ b/classes/s.php
@@ -95,11 +95,12 @@ class S
     {
         $uid = S::i('uid', $uid);
         if (!S::has('log') || !S::v('log')->isValid($uid)) {
+            global $platal;
             if (S::has('suid')) {
                 $suid = S::v('suid');
-                S::set('log', PlLogger::get(S::i('uid', $uid), $suid['uid']));
+                S::set('log', $platal->buildLogger(S::i('uid', $uid), $suid['uid']));
             } else if (S::has('uid') || $uid) {
-                S::set('log', PlLogger::get(S::i('uid', $uid)));
+                S::set('log', $platal->buildLogger(S::i('uid', $uid)));
             } else {
                 S::set('log', PlLogger::dummy($uid));
             }
-- 
2.1.4