diff --git a/ChangeLog b/ChangeLog index 6ea54d6c0..b98086222 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.9.41 Frontend: - * FIX: Fix failing reporting of errors when messages contained special characters + * Added option "line_width" to default section of global config + * FIX: Fix failing reporting of errors when messages contained special characters 1.9.40 Core: diff --git a/share/server/core/classes/GlobalMainCfg.php b/share/server/core/classes/GlobalMainCfg.php index 04333835b..7cefc458c 100644 --- a/share/server/core/classes/GlobalMainCfg.php +++ b/share/server/core/classes/GlobalMainCfg.php @@ -694,6 +694,12 @@ public function __construct() { 'default' => '10:#8c00ff,25:#2020ff,40:#00c0ff,55:#00f000,70:#f0f000,85:#ffc000,100:#ff0000', 'match' => MATCH_WEATHER_COLORS, ), + 'line_width' => Array( + 'must' => 0, + 'editable' => 1, + 'default' => 3, + 'match' => MATCH_INTEGER, + ), 'zoombar' => Array( 'must' => 0, 'editable' => 1, diff --git a/share/server/core/mapcfg/default.php b/share/server/core/mapcfg/default.php index 64a22cd73..6ed886e26 100644 --- a/share/server/core/mapcfg/default.php +++ b/share/server/core/mapcfg/default.php @@ -565,10 +565,10 @@ function listSources($MAPCFG, $objId, $attrs) { 'depends_value' => 'line', ), 'line_width' => Array( - 'must' => 0, - 'default' => '3', - 'match' => MATCH_INTEGER, - 'depends_on' => 'view_type', + 'must' => 0, + 'default' => cfg('defaults', 'line_width'), + 'match' => MATCH_INTEGER, + 'depends_on' => 'view_type', 'depends_value' => 'line'), 'line_weather_colors' => Array( 'must' => 0,