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

This commit is contained in:
Uwe Steinmann 2020-12-11 09:28:10 +01:00
commit d46d6821fc

View File

@ -208,7 +208,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
file_put_contents($this->params['cachedir'].'/js/'.$hashjs.'.js', $jscode); file_put_contents($this->params['cachedir'].'/js/'.$hashjs.'.js', $jscode);
} }
$tmp['action'] = 'footerjs'; $tmp['action'] = 'footerjs';
$tmp['hash'] = $hashjs; $tmp['hashjs'] = $hashjs;
echo '<script src="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n"; echo '<script src="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n";
} }
if(method_exists($this, 'js')) { if(method_exists($this, 'js')) {
@ -234,8 +234,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
function footerjs() { /* {{{ */ function footerjs() { /* {{{ */
header('Content-Type: application/javascript'); header('Content-Type: application/javascript');
if(file_exists($this->params['cachedir'].'/js/'.$_GET['hash'].'.js')) { if(file_exists($this->params['cachedir'].'/js/'.$_GET['hashjs'].'.js')) {
readfile($this->params['cachedir'].'/js/'.$_GET['hash'].'.js'); readfile($this->params['cachedir'].'/js/'.$_GET['hashjs'].'.js');
} }
} /* }}} */ } /* }}} */