[geeklog-cvs] geeklog: Fixed 'cookiedomain' being reported as changed (bug #00...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4866ec0c967a
changeset: 6414:4866ec0c967a
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Oct 03 19:00:53 2008 +0200
description:
Fixed 'cookiedomain' being reported as changed (bug #0000638)

diffstat:

2 files changed, 10 insertions(+)
public_html/docs/history        |    2 ++
system/classes/config.class.php |    8 ++++++++

diffs (30 lines):

diff -r c1e86eb7ad40 -r 4866ec0c967a public_html/docs/history
--- a/public_html/docs/history	Fri Oct 03 17:20:23 2008 +0200
+++ b/public_html/docs/history	Fri Oct 03 19:00:53 2008 +0200
@@ -3,6 +3,8 @@
 ??? ??, 2008 (1.5.2)
 ------------
 
+- Fixed 'cookiedomain' being reported as changed in the Configuration
+  (bug #0000638) [Dirk]
 - Reverted fix for bug #0000618 (COM_showMessage automatically picking up a
   'plugin' parameter) as it's causing problems when displaying more than one
   message on the same page [Dirk]
diff -r c1e86eb7ad40 -r 4866ec0c967a system/classes/config.class.php
--- a/system/classes/config.class.php	Fri Oct 03 17:20:23 2008 +0200
+++ b/system/classes/config.class.php	Fri Oct 03 19:00:53 2008 +0200
@@ -738,6 +738,14 @@
             $value = DB_getItem($_TABLES['conf_values'], 'value',
                                 "group_name='Core' AND name='language'");
             $this->config_array['Core']['language'] = unserialize($value);
+
+            /**
+             * Same with $_CONF['cookiedomain'], which is overwritten in
+             * in lib-sessions.php (if empty).
+             */
+            $value = DB_getItem($_TABLES['conf_values'], 'value',
+                                "group_name='Core' AND name='cookiedomain'");
+            $this->config_array['Core']['cookiedomain'] = unserialize($value);
         }
 
         $success_array = array();