merge from trunk r1399:1400 into branch 1.6

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1401 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 1 insertions, 1 deletions

diff --git a/include/functions.inc.php b/include/functions.inc.php
index 89bf29c0f..970f80786 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -847,7 +847,7 @@ function get_themeconf($key)
 {
   global $themeconf;
 
-  return $themeconf[$key];
+  return isset($themeconf[$key]) ? $themeconf[$key] : '';
 }
 
 /**