Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2023-07-20 11:21:09 +02:00
commit 54bdbfdc56

View File

@ -97,14 +97,16 @@ class UI extends UI_Default {
* views/bootstrap/class.xx.php, without setting the 'views' element * views/bootstrap/class.xx.php, without setting the 'views' element
* in the configuration * in the configuration
*/ */
if(file_exists($settings->_rootDir.'ext/'.$extname.'/out/out.'.$class.".php"))
$httpbasedir = 'ext/'.$extname.'/';
$filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php"; $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php";
if(file_exists($filename)) { if(file_exists($filename)) {
$httpbasedir = 'ext/'.$extname.'/'; //$httpbasedir = 'ext/'.$extname.'/';
break; break;
} else { } else {
$filename = $settings->_rootDir.'ext/'.$extname.'/views/bootstrap/class.'.$class.".php"; $filename = $settings->_rootDir.'ext/'.$extname.'/views/bootstrap/class.'.$class.".php";
if(file_exists($filename)) { if(file_exists($filename)) {
$httpbasedir = 'ext/'.$extname.'/'; //$httpbasedir = 'ext/'.$extname.'/';
break; break;
} }
} }