From 37ceed32d8486c8e33cb6ce79ef6b7b4af03a64d Mon Sep 17 00:00:00 2001
From: emkael <emkael@tlen.pl>
Date: Mon, 25 Apr 2016 12:17:09 +0200
Subject:  * deriving BaseUrl from BasePath only if it's set

---
 app/php/web/AssetManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/php')

diff --git a/app/php/web/AssetManager.php b/app/php/web/AssetManager.php
index 1094917..72d8ef1 100644
--- a/app/php/web/AssetManager.php
+++ b/app/php/web/AssetManager.php
@@ -3,7 +3,7 @@
 class AssetManager extends TAssetManager {
 
     public function init($config) {
-        if ($this->BaseUrl === NULL) {
+        if ($this->BaseUrl === NULL && $this->BasePath !== NULL) {
             $appWebPath = preg_replace(
                 '#' . $this->Application->Request->ApplicationUrl . '$#',
                 '',
-- 
cgit v1.2.3