Merged changes from mai trunk up to 2.3.1

[fa-stable.git] / config.default.php

diff --git a/config.default.php b/config.default.php
index 692c87b5ba30d7355fa07da29371133a420821c2..6705918f5be30bc876144d02a1c1065832b66c27 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -11,7 +11,7 @@
 ***********************************************************************/
     //--------------------------------------------------
 
-       // User configurable variables
+       // User configurable variables
        //---------------------------------------------------
 
        /*Show debug messages returned from an error on the page.
@@ -20,6 +20,10 @@
 
 if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
        die("Restricted access");
+
+       if (!ini_get('date.timezone'))
+       ini_set('date.timezone', 'Europe/Berlin');
+
        // Log file for error/warning messages. Should be set to any location
        // writable by www server. When set to empty string logging is switched off. 
        // Special value 'syslog' can be used for system logger usage (see php manual).
@@ -142,6 +146,12 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 
        $config_allocation_settled_allowance = 0.005;
 
+       /* Allow negative prices for dummy/service items. To be moved to GL db settings */
+       $allow_negative_prices = 1;
+
+       /* Show menu category icons in core themes */
+       $show_menu_category_icons = 0;
+       
        // Internal configurable variables
        //-----------------------------------------------------------------------------------