X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2FAppKernel.php;h=40726f0549cc9c756e08a1a00f2cf989859a43a0;hb=f6b9e883c01196d5aec249f6e8e02e07d0da4089;hp=45f6b795905ea8145357da4f714e01bc402442e6;hpb=64f4112caea165d79d10c624bcc69e6a3597714f;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 45f6b795..40726f05 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -58,11 +58,6 @@ class AppKernel extends Kernel
         return $bundles;
     }
 
-    public function getRootDir()
-    {
-        return __DIR__;
-    }
-
     public function getCacheDir()
     {
         return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
@@ -75,7 +70,7 @@ class AppKernel extends Kernel
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
+        $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
         $loader->load(function ($container) {
             if ($container->getParameter('use_webpack_dev_server')) {
                 $container->loadFromExtension('framework', [
@@ -83,6 +78,12 @@ class AppKernel extends Kernel
                        'base_url' => 'http://localhost:8080/',
                    ],
                ]);
+            } else {
+                $container->loadFromExtension('framework', [
+                    'assets' => [
+                        'base_url' => $container->getParameter('domain_name'),
+                    ],
+                ]);
             }
         });
     }