From b028b3586c5022753e9ff390a042aac9f5b863f4 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Thu, 14 May 2015 11:10:30 -0400 Subject: Return application url if defined for the helper getCurrentBaseUrl() --- app/Core/Helper.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/Core') 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://'; -- cgit v1.2.3