fix notice on update

glpi-project · Oct 8, 2015 · fce111e · fce111e
1 parent c1635eb
commit fce111e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/inc/commonglpi.class.php b/inc/commonglpi.class.php
@@ -1060,7 +1060,7 @@ function show($options=array()) {
     * @return bool
     */
    public static function isLayoutWithMain() {
-      return in_array($_SESSION['glpilayout'], array('classic', 'vsplit'));
+      return (isset($_SESSION['glpilayout']) && in_array($_SESSION['glpilayout'], array('classic', 'vsplit')));
    }
 
 

diff --git a/inc/html.class.php b/inc/html.class.php
@@ -1065,7 +1065,9 @@ static function includeHeader($title='') {
       echo Html::css($CFG_GLPI["root_doc"]."/css/styles.css");
 
       // CSS theme link
-      echo Html::css($CFG_GLPI["root_doc"]."/css/palettes/".$_SESSION["glpipalette"].".css");
+      if (isset($_SESSION["glpipalette"])) {
+         echo Html::css($CFG_GLPI["root_doc"]."/css/palettes/".$_SESSION["glpipalette"].".css");
+      }
 
       // surcharge CSS hack for IE
       echo "<!--[if lte IE 6]>" ;