gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16074 from ebuildy/fix/missing_base_dir

Browse Source 
Add missing base_dir when adding javascript files
This commit is contained in:
Maurício Meneghini Fauth 2020-04-13 17:12:24 -03:00 committed by GitHub
commit 4bd3840096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/classes/Scripts.php
View File

@ -146,7 +146,10 @@ class Scripts
*/
public function getDisplay()
{
$baseDir = defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : '';
return $this->template->render('scripts', [
'base_dir' => $baseDir,
'files' => $this->_files,
'version' => PMA_VERSION,
'code' => $this->_code,

2
templates/scripts.twig
View File

@ -1,5 +1,5 @@
{% for file in files %}
<script data-cfasync="false" type="text/javascript" src="js/{{ file.filename }}
<script data-cfasync="false" type="text/javascript" src="{{ base_dir }}js/{{ file.filename }}
{{- '.php' in file.filename ? get_common(file.params|merge({'v': version})) : '?v=' ~ version|url_encode }}"></script>
{% endfor %}