Fixed an array_combine object issue.

[fa-stable.git] / includes / main.inc

diff --git a/includes/main.inc b/includes/main.inc
index 38ceaa1df9730e4c5ba5b5200b2893e10cf36035..df31aa17a52a4e84d4ea6a0e968fdbc7ebe56d30 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -68,6 +68,24 @@ function end_page($no_menu=false, $is_index=false, $final_screen=false, $type_no
        page_footer($no_menu, $is_index);
 }
 
+function css_files_ensure_init() {
+       global $css_files, $path_to_root;
+
+       if (!isset($css_files))
+       {
+               $theme = user_theme();
+               $css_files = array();
+               $css_files[] = $path_to_root . "/themes/$theme/default.css";
+       }
+}
+
+function add_css_file($filename)
+{
+       global $css_files;
+       css_files_ensure_init();
+       $css_files[] = $filename;
+}
+
 function cache_js_file($fpath, $text) 
 {
        global $SysPrefs;
@@ -400,6 +418,7 @@ if (!function_exists('array_fill_keys')) // since 5.2
 {
        function array_fill_keys($keys, $value)
        {
-               return array_combine($keys, array_fill(count($keys), $value));
+               return (object)array_combine($keys, array_fill(count($keys), $value));
        }
 }
+