From 3760272baf167f084c2c369f556d9c320b4b2a40 Mon Sep 17 00:00:00 2001
From: Thomas Decaux <ebuildy@gmail.com>
Date: Mon, 13 Apr 2020 16:48:34 +0200
Subject: [PATCH] Add missing base_dir when adding javascript files

Signed-off-by: Thomas Decaux <ebuildy@gmail.com>
---
 libraries/classes/Scripts.php | 3 +++
 templates/scripts.twig        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/classes/Scripts.php b/libraries/classes/Scripts.php
index 9f343a7def..7467f82f1b 100644
--- a/libraries/classes/Scripts.php
+++ b/libraries/classes/Scripts.php
@@ -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,
diff --git a/templates/scripts.twig b/templates/scripts.twig
index 13a29a3091..c96122c2e6 100644
--- a/templates/scripts.twig
+++ b/templates/scripts.twig
@@ -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 %}