Landingpage URL must always start with leading slash. Fix issue with obsolete ? in removal URL

Author: bramstroker

app/code/local/Emico/AttributeLanding/Model/Page.php

@@ -7,7 +7,6 @@
 /**
  * Class Emico_AttributeLanding_Model_Page
  *
- * @method string getUrlPath();
  * @method $this setUrlPath(string $path);
  * @method $this setActive(bool $active);
  * @method bool getActive();
@@ -142,4 +141,16 @@ public function getCanonicalUrl()
 
         return Mage::getBaseUrl() . $this->getUrlPath();
     }
+
+    /**
+     * @return string
+     */
+    public function getUrlPath()
+    {
+        $urlPath = $this->getData('url_path');
+        if (substr($urlPath, 0, 1) !== '/') {
+            $urlPath = '/' . $urlPath;
+        }
+        return $urlPath;
+    }
 }

app/code/local/Emico/AttributeLanding/Model/Tweakwise/UrlStrategy/AttributeLandingStrategy.php

@@ -33,7 +33,12 @@ public function buildUrl(Emico_Tweakwise_Model_Catalog_Layer $state, Emico_Tweak
         /** @var Emico_AttributeLanding_Model_Page $landingPage */
         $landingPage = Mage::app()->getRequest()->getParam('page');
         if ($landingPage && $attribute->getIsSelected()) {
-            return $landingPage->getUrlPath() . '?' . http_build_query($this->getQueryParamStrategy()->getUrlKeyValPairs($facet, $attribute));
+            $filterPart = http_build_query($this->getQueryParamStrategy()->getUrlKeyValPairs($facet, $attribute));
+            $removeUrl = $landingPage->getUrlPath();
+            if (!empty($filterPart)) {
+                $removeUrl .= '?' . $filterPart;
+            }
+            return $removeUrl;
         }
 
         // Check if we have an attribute landing page available for the filter combination
@@ -47,7 +52,7 @@ public function buildUrl(Emico_Tweakwise_Model_Catalog_Layer $state, Emico_Tweak
         $page = $this->findLandingPageByFilters($category, $filterHash);
 
         if ($page !== null) {
-            return '/' . $page->getUrlPath() . '#no-ajax';
+            return $page->getUrlPath() . '#no-ajax';
         }
 
         return null;