Merge pull request #3524 from wallabag/fix-assets-sub

Fix assets for subfolder install

2 files changed, 7 insertions, 1 deletions

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 90e9f1d8..40726f05 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -78,6 +78,12 @@ class AppKernel extends Kernel
                        'base_url' => 'http://localhost:8080/',
                    ],
                ]);
+            } else {
+                $container->loadFromExtension('framework', [
+                    'assets' => [
+                        'base_url' => $container->getParameter('domain_name'),
+                    ],
+                ]);
             }
         });
     }
diff --git a/app/config/webpack/common.js b/app/config/webpack/common.js
index 47113950..233497fd 100644
--- a/app/config/webpack/common.js
+++ b/app/config/webpack/common.js
@@ -14,7 +14,7 @@ module.exports = function () {
     output: {
       filename: '[name].js',
       path: path.resolve(rootDir, 'web/wallassets'),
-      publicPath: '/wallassets/',
+      publicPath: '',
     },
     plugins: [
       new webpack.ProvidePlugin({