From e00505767df7d8006fcc89ad51b5f5a9b7e7c418 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 28 Aug 2012 09:44:22 +0000
Subject: [PATCH] *Skylark: .ini session_table issue fixed

git-svn-id: svn://ultimatepp.org/upp/trunk@5294 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Callback1.h                 | 2 +-
 uppsrc/Skylark/Session.cpp              | 1 +
 uppsrc/Skylark/src.tpp/Config$en-us.tpp | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/uppsrc/Core/Callback1.h b/uppsrc/Core/Callback1.h
index 2f024478a..98303b856 100644
--- a/uppsrc/Core/Callback1.h
+++ b/uppsrc/Core/Callback1.h
@@ -21,7 +21,7 @@ template <class O, class M, class T>
 struct CallbackMethodActionArg : public CallbackAction {
 	O  *object;
 	M   method;
-	T         arg;
+	T   arg;
 
 	void    Execute() { (object->*method)(arg); }
 
diff --git a/uppsrc/Skylark/Session.cpp b/uppsrc/Skylark/Session.cpp
index 5c9144038..821ddcad0 100644
--- a/uppsrc/Skylark/Session.cpp
+++ b/uppsrc/Skylark/Session.cpp
@@ -29,6 +29,7 @@ SkylarkSessionConfig::SkylarkSessionConfig()
 	data_column = (String)Ini::session_data_column;
 	lastwrite_column = (String)Ini::session_lastwrite_column;
 	expire = Ini::session_expire;
+	table = (String)Ini::session_table;
 }
 
 String Http::SessionFile(const String& sid)
diff --git a/uppsrc/Skylark/src.tpp/Config$en-us.tpp b/uppsrc/Skylark/src.tpp/Config$en-us.tpp
index 3eb3c9ed1..ec033abc8 100644
--- a/uppsrc/Skylark/src.tpp/Config$en-us.tpp
+++ b/uppsrc/Skylark/src.tpp/Config$en-us.tpp
@@ -52,7 +52,7 @@ which defaults to `"ID`".&]
 [s5;:SkylarkSessionConfig`:`:lastwrite`_column: [_^SqlId^ SqlId]_[* lastwrite`_column]&]
 [s2;%% SQL table column used to store last`-write time of session. 
 Column must be able to store Time type. Default value is loaded 
-from `"session`_last`_column`" .ini parameter, which defaults 
+from `"session`_lastwrite`_column`" .ini parameter, which defaults 
 to `"LASTWRITE`".&]
 [s3; &]
 [s4; &]