Module: nagvis Branch: master Commit: 41b3d0bf9a30c8e6b09d985a27b94b6d220ee67f URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=41b3d0bf9a30c8e6b09d985a27b94b6d220ee67f
Author: LaMi <[email protected]> Date: Wed Apr 28 20:19:34 2010 +0200 Skipping deprecated options in WUI general configuration dialog --- share/server/core/classes/GlobalMainCfg.php | 2 +- share/server/core/classes/WuiViewEditMainCfg.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/share/server/core/classes/GlobalMainCfg.php b/share/server/core/classes/GlobalMainCfg.php index 6c092e5..b020fa2 100644 --- a/share/server/core/classes/GlobalMainCfg.php +++ b/share/server/core/classes/GlobalMainCfg.php @@ -239,7 +239,7 @@ class GlobalMainCfg { 'hovertimeout' => Array('must' => 0, 'editable' => 1, 'default' => '5', - 'deprecated' => '1', + 'deprecated' => 1, 'match' => MATCH_INTEGER), 'hoverdelay' => Array('must' => 0, 'editable' => 1, diff --git a/share/server/core/classes/WuiViewEditMainCfg.php b/share/server/core/classes/WuiViewEditMainCfg.php index 048423b..43d5137 100644 --- a/share/server/core/classes/WuiViewEditMainCfg.php +++ b/share/server/core/classes/WuiViewEditMainCfg.php @@ -83,6 +83,10 @@ class WuiViewEditMainCfg { $class = ''; $style = ''; $isDefaultValue = false; + + // Skip deprecated options + if(isset($prop['deprecated']) && $prop['deprecated'] == 1) + continue; // Set field type to show $fieldType = 'text'; @@ -92,7 +96,6 @@ class WuiViewEditMainCfg { // Don't show anything for hidden options if($fieldType !== 'hidden') { - // Only get the really set value $val2 = $this->CORE->getMainCfg()->getValue($cat, $propname, true); ------------------------------------------------------------------------------ _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
