Merge branch 'master' into WebGUI8

2010-04-13 07:50:02 -05:00 · 2010-04-13 07:50:02 -05:00 · 2400f19099
commit 2400f19099
parent e8d196c020 88e8fe77fb
797 changed files with 33894 additions and 27196 deletions
--- a/lib/WebGUI/PassiveProfiling.pm
+++ b/lib/WebGUI/PassiveProfiling.pm
@ -60,7 +60,7 @@ sub add {
                       [
                        $session->id->generate(),        $session->user->userId,
                        $session->var->get("sessionId"), $assetId,
-                        $session->datetime->time(),
+                        time(),
                       ]);
    return undef;
 }