Merge pull request #31 from henkelund/2.0.2

2.0.2
fnogatz · May 6, 2018 · 22ab5c5 · 22ab5c5
2 parents 1685ec0 + 55fcb80
commit 22ab5c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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

diff --git 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';
     }
 
     /**