Merge branch 'master' of git://github.com/tsabi/dokuwiki into pull-request-2620

* 'master' of git://github.com/tsabi/dokuwiki:
  php7 fix
  Fix a php7 bug

lib/exe/css.php

@@ -76,7 +76,7 @@ function css_out(){
             $files = array_merge($files, $styleini['stylesheets'][$mediatype]);
         }
         // load user styles
-        if(!empty($config_cascade['userstyle'][$mediatype])) {
+        if(is_array($config_cascade['userstyle'][$mediatype]) && count($config_cascade['userstyle'][$mediatype])>0) {
             foreach($config_cascade['userstyle'][$mediatype] as $userstyle) {
                 $files[$userstyle] = DOKU_BASE;
             }

lib/exe/js.php

@@ -66,7 +66,7 @@ function js_out(){
 
     // add possible plugin scripts and userscript
     $files   = array_merge($files,js_pluginscripts());
-    if(!empty($config_cascade['userscript']['default'])) {
+    if(is_array($config_cascade['userscript']['default']) && count($config_cascade['userscript']['default'])>0) {
         foreach($config_cascade['userscript']['default'] as $userscript) {
             $files[] = $userscript;
         }