From 73ab87de7441c9c0eac123c1c44c2cf1ffdbe189 Mon Sep 17 00:00:00 2001
From: Gabriel Birke <birke@d-scribe.de>
Date: Sun, 2 Jan 2011 21:00:02 +0100
Subject: If cookiedir is configured, use it.

If $conf['cookiedir'] is set, use this setting instead of DOKU_REL.
---
 inc/init.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'inc/init.php')

diff --git a/inc/init.php b/inc/init.php
index ed4409729..faf5f54e1 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -148,10 +148,11 @@ if ($conf['gzip_output'] &&
 // init session
 if (!headers_sent() && !defined('NOSESSION')){
     session_name("DokuWiki");
+    $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'];
     if (version_compare(PHP_VERSION, '5.2.0', '>')) {
-        session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
+        session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl()),true);
     }else{
-        session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
+        session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl()));
     }
     session_start();
 
-- 
cgit v1.2.3


From e4f389ef1728a0f86164a0e4b88626be9860dabb Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 26 May 2011 14:23:33 +0300
Subject: media version saving

---
 inc/init.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'inc/init.php')

diff --git a/inc/init.php b/inc/init.php
index 819d92bdc..e82e26efd 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -230,7 +230,9 @@ function init_paths(){
     $paths = array('datadir'   => 'pages',
             'olddir'    => 'attic',
             'mediadir'  => 'media',
+            'mediaolddir' => 'media_attic',
             'metadir'   => 'meta',
+            'mediametadir' => 'media_meta',
             'cachedir'  => 'cache',
             'indexdir'  => 'index',
             'lockdir'   => 'locks',
-- 
cgit v1.2.3