From e1c4af87cc40058840d6dd7c070049ae0ac25d98 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 17 Jul 2008 14:22:48 +0000
Subject: [PATCH] custom color and darkblue_orange

---
 ChangeLog                                      | 2 +-
 themes/darkblue_orange/css/theme_right.css.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a63b6ea9b..2e8dd8e5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,7 +63,7 @@ danbarry
 + rfe #1962383 [designer] Option to create a PDF page 
 - patch #2007196, Typos in comments, thanks to knittl - knittl
 - bug #1982315 [GUI] Comma and quote in ENUM, thanks to Joshua Hogendorn
-+ [GUI] Color picker (work in progress, now just for original theme) 
++ [GUI] Color picker
 - bug #1970836 [parser] SQL parser is slow, thanks to Christian Schmidt 
 + rfe #1692928 [transformation] Option to disable browser transformations 
 + [import] Speed optimization to be able to import the sakila database
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index fb5cbfc32..2aa77d7ed 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -30,7 +30,7 @@ body {
     padding:            0;
     margin:             0.5em;
     color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
-    background:         <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
+    background:         <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
 }
 
 <?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>