base tag will now be set upon application settings

diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index 5a4912af5ed0f07f83852b62ca33bbda63947ac8..f93c99ac9ddc762fe8f075ec68f2463f1221a811 100644 (file)
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -1,3 +1,4 @@
+<base href="{$baseHref}" />
 <meta charset="utf-8" />
 <meta name="description" content="{META_DESCRIPTION}" />
 <meta name="keywords" content="{META_KEYWORDS}" />

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 5b5df17a3d250ab8c03679b35a517445f595e4b6..52e7366b042836cf7caebdead6b9c0a2e6ae6fca 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -444,9 +444,12 @@ class WCF {
                        throw new exception\SystemException('Unable to run '.$row['package'].', '.$className.' missing.');
                }
                
-               // load options
                if (!$isDepedentApplication) {
+                       // load options
                        $this->loadOptions($packageDir.'options.inc.php', $application->packageID);
+                       
+                       // assign base tag
+                       $this->getTPL()->assign('baseHref', $application->domainName . $application->domainPath);
                }
        }