Update core.

Also update the documentation of the parameters in platal.ini.

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

diff --git a/configs/platal.ini b/configs/platal.ini
index a8cb4c2..a301864 100644 (file)
--- a/configs/platal.ini
+++ b/configs/platal.ini
@@ -77,8 +77,12 @@ robotstxt_disallowed_uris =
 ;   1 - DEBUG_BT: displays the backtraces (SQL, mailman, banana executions)
 ;   2 - DEBUG_VALID: checks that the html of the page is valid
 ;   4 - DEBUG_SMARTY: don't hide error reported during the execution of smarty
+;   8 - DEBUG_NOCACHE: disable data caching
+;  16 - DEBUG_SCRIPTCACHE: cache expires after the execution of the script (no caching
+;                          in session or via memcache)
 ;  - provided by xorg:
-; 256 - DEBUG_NOCACHE: don't cache db content in the session
+; 256 - DEBUG_NOCACHE: don't cache db content in the session (this feature as been moved
+;                      to the core and this flag is deprecated)
 ;
 ; debug = 0
 
@@ -125,6 +129,10 @@ baseurl = "https://www.example.org/"
 ; The charset to use when talking to the database
 ; dbcharset = "utf8"
 
+; $globals->core->memcache
+; List of space separated addresses of memcache servers
+memcache = ""
+
 ; $globals->static_cache_duration
 ; Cache duration for static content
 ; static_cache_duration = "604800"

diff --git a/core b/core
index 6305462..26d00fe 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 6305462f32087ac6f212e563946e8c5f6d3f204e
+Subproject commit 26d00fe51bd4399ec2f9dff4a797daf2fc23961a