Commit 86936449 authored by Sven Rhinow's avatar Sven Rhinow

Fix: Contao 3.1.5 Uuid - Error > Versionsabfrage und Abfrage ob überhaupt befuellt

parent 32d8c2c2
......@@ -159,19 +159,34 @@ class ModuleSRLayer extends \Module
$jsOptions = implode(', ',$this->optionsArr);
//eigene CSS-Auszeichnungen aus CSS-Datei
$cssObjFile = \FilesModel::findByPk($this->srl_css_file);
if ($cssObjFile === null)
//eigene CSS-Auszeichnungen aus CSS-Datei
if($this->srl_css_file)
{
if (!Validator::isUuid($this->srl_css_file))
$cssObjFile = \FilesModel::findByPk($this->srl_css_file);
if(version_compare(VERSION.BUILD, '3.2.0','>='))
{
if ($cssObjFile === null)
{
if (!Validator::isUuid($this->srl_css_file))
{
$this->log($GLOBALS['TL_LANG']['ERR']['version2format'],'ModuleSRLayer.php srl_css_file','TL_ERROR');
}
}
}
elseif(version_compare(VERSION.BUILD, '3.2.0','<'))
{
$this->log($GLOBALS['TL_LANG']['ERR']['version2format'],'ModuleSRLayer.php srl_css_file','TL_ERROR');
if (!is_numeric($this->srl_css_file))
{
$this->log($GLOBALS['TL_LANG']['ERR']['version2format'],'ModuleSRLayer.php srl_css_file','TL_ERROR');
}
}
$cssPath = $cssObjFile->path;
}
$GLOBALS['TL_CSS'][] = ($cssObjFile->path) ? $cssObjFile->path : $GLOBALS['SRL_CSS'].'?'.time();
$GLOBALS['TL_CSS'][] = ($cssPath) ? $cssPath : $GLOBALS['SRL_CSS'].'?'.time();
foreach($GLOBALS['SRL_JS']['mootools'] as $jsSource)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment