summaryrefslogtreecommitdiff
path: root/app/Core
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-05-14 11:10:30 -0400
committerFrederic Guillot <fred@kanboard.net>2015-05-14 11:10:30 -0400
commitb028b3586c5022753e9ff390a042aac9f5b863f4 (patch)
tree4a3edfe63b61ada9bdb5015102cb479a89106d3f /app/Core
parent22f44ef78820e75ce21913140b50d15c7213ccca (diff)
Return application url if defined for the helper getCurrentBaseUrl()
Diffstat (limited to 'app/Core')
-rw-r--r--app/Core/Helper.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/Core/Helper.php b/app/Core/Helper.php
index 740ff7c2..0650c293 100644
--- a/app/Core/Helper.php
+++ b/app/Core/Helper.php
@@ -515,6 +515,12 @@ class Helper
*/
public function getCurrentBaseUrl()
{
+ $application_url = $this->config->get('application_url');
+
+ if (! empty($application_url)) {
+ return $application_url;
+ }
+
$self = str_replace('\\', '/', dirname($_SERVER['PHP_SELF']));
$url = Request::isHTTPS() ? 'https://' : 'http://';