From 43a0a9c60dd2fcb65e173f4a601f005d4e591c07 Mon Sep 17 00:00:00 2001 From: Henrik Hedelund Date: Sun, 6 May 2018 18:33:53 +0200 Subject: [PATCH 1/2] #30 Don't remove trailing slash from script paths --- Helper/Data.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Helper/Data.php b/Helper/Data.php index 29f87cb..6c30440 100644 --- a/Helper/Data.php +++ b/Helper/Data.php @@ -142,11 +142,11 @@ public function getCdnBaseUrl($store = null, $secure = null) */ public function getJsScriptPath($store = null) { - return trim($this->scopeConfig->getValue( + return ltrim(trim($this->scopeConfig->getValue( self::XML_PATH_JS_SCRIPT_PATH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store - ), ' /') ?: 'piwik.js'; + )), '/') ?: 'piwik.js'; } /** @@ -170,11 +170,11 @@ public function getJsScriptUrl($store = null, $secure = null) */ public function getPhpScriptPath($store = null) { - return trim($this->scopeConfig->getValue( + return ltrim(trim($this->scopeConfig->getValue( self::XML_PATH_PHP_SCRIPT_PATH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store - ), ' /') ?: 'piwik.php'; + )), '/') ?: 'piwik.php'; } /** From 55fcb80176b1f11ff4eaccdbac3de07a82cbed32 Mon Sep 17 00:00:00 2001 From: Henrik Hedelund Date: Sun, 6 May 2018 18:34:58 +0200 Subject: [PATCH 2/2] Add Magento 2.2.4 to .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c761997..9088111 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ php: - 7.1 - 7.0 env: + - M2_VERSION=2.2.4 - M2_VERSION=2.2.3 - M2_VERSION=2.2.2 - M2_VERSION=2.2.1