From 368ef8478c2573fbd0518842fcfcf5b086803a08 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 22 Jul 2015 07:08:22 +0200 Subject: [PATCH] use view classes from extension only if enabled --- inc/inc.ClassUI.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index 7656d6dc9..446b73649 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -57,17 +57,19 @@ class UI extends UI_Default { */ $filename = ''; foreach($EXT_CONF as $extname=>$extconf) { - $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php"; - if(file_exists($filename)) { - break; - } - $filename = ''; - if(isset($extconf['views'][$class])) { - $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file']; + if(!isset($extconf['disable']) || $extconf['disable'] == false) { + $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php"; if(file_exists($filename)) { - $classname = $extconf['views'][$class]['name']; break; } + $filename = ''; + if(isset($extconf['views'][$class])) { + $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file']; + if(file_exists($filename)) { + $classname = $extconf['views'][$class]['name']; + break; + } + } } } if(!$filename)