From 06c9ee33a6fa99795455452d90a155e58f1297d7 Mon Sep 17 00:00:00 2001
From: Marius van Witzenburg <info@mariusvw.com>
Date: Wed, 2 Sep 2015 17:01:24 +0200
Subject: [PATCH] Fixed several undefined errors.
---
inc/common.php | 2 +-
lib/exe/css.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/inc/common.php b/inc/common.php
index e14bd7af4..17facd249 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1860,7 +1860,7 @@ function valid_input_set($param, $valid_values, $array, $exc = '') {
*/
function get_doku_pref($pref, $default) {
$enc_pref = urlencode($pref);
- if(strpos($_COOKIE['DOKU_PREFS'], $enc_pref) !== false) {
+ if(isset($_COOKIE['DOKU_PREFS']) && strpos($_COOKIE['DOKU_PREFS'], $enc_pref) !== false) {
$parts = explode('#', $_COOKIE['DOKU_PREFS']);
$cnt = count($parts);
for($i = 0; $i < $cnt; $i += 2) {
diff --git a/lib/exe/css.php b/lib/exe/css.php
index 925b78a76..507a68737 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -296,12 +296,12 @@ function css_styleini($tpl, $preview=false) {
$data = parse_ini_file($ini, true);
// stylesheets
- if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
+ if(isset($data['stylesheets']) && is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
$stylesheets[$mode][$incbase.$file] = $webbase;
}
// replacements
- if(is_array($data['replacements'])){
+ if(isset($data['replacements']) && is_array($data['replacements'])){
$replacements = array_merge($replacements, css_fixreplacementurls($data['replacements'],$webbase));
}
}
--
GitLab