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

This commit is contained in:
Uwe Steinmann 2023-07-17 14:56:07 +02:00
commit 7c0634f272

View File

@ -82,13 +82,17 @@ class UI extends UI_Default {
* will not be set because out/out.xxx.php is still used. * will not be set because out/out.xxx.php is still used.
*/ */
if(isset($extconf['views'][$class])) { if(isset($extconf['views'][$class])) {
$filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file']; $themes = [$theme];
$themes[] = 'bootstrap';
foreach($themes as $ttheme) {
$filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$ttheme."/".$extconf['views'][$class]['file'];
if(file_exists($filename)) { if(file_exists($filename)) {
// $httpbasedir = 'ext/'.$extname.'/'; // $httpbasedir = 'ext/'.$extname.'/';
$classname = $extconf['views'][$class]['name']; $classname = $extconf['views'][$class]['name'];
break; break;
} }
} }
}
/* New views are added by creating a file out/out.xx.php and /* New views are added by creating a file out/out.xx.php and
* 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