Merge branch 'release'

CHANGELOG.txt

@@ -1,4 +1,9 @@
-Versuib 2.5.3
+Version 2.5.4
+    FIX: build the slider base URL the correct way (it's not ensured the empty parameter is at the end)
+    FIX: all events must have a source ref key except of session start
+    FIX: accept the navigation parameter as it is accepted with FF6.9
+
+Version 2.5.3
     FIX: accept the navigation parameter as it is accepted with FF6.9
     FIX: added missing $this on setupEventTracking execution
     FIX: Fixed bugs when creating paging data in 6.9 search adapters.

build.xml

@@ -2,7 +2,7 @@
 
 <project name="FACT-Finder PHP Framework" default="build">
 
-	<property name="version"  value="2.5.3" override="true" />
+	<property name="version"  value="2.5.4" override="true" />
     <property name="buildBaseDir" value="./build" override="true" />
 	<property name="packageName" value="FACTFinderPHPFramework" override="true" />
     <property name="srcdir"   value="${project.basedir}" override="true" />

lib/FACTFinder/Default/TrackingAdapter.php

@@ -34,9 +34,6 @@ public function applyTracking()
 
     public function prepareDefaultParams($inputParams, $event) {
         $eventsNoSourceRefKeyRequired = array(
-            self::EVENT_INSPECT,
-            self::EVENT_CART,
-            self::EVENT_BUY,
             self::EVENT_SESSION_START
         );
 

lib/FACTFinder/Json66/SearchAdapter.php

@@ -257,10 +257,7 @@ protected function createFilter($elementData, $group)
         $filterLink = $this->createLink($elementData);
 
         if ($group->isSliderStyle()) {
-            // get last (empty) parameter from the search params property
-            $params = $this->getParamsParser()->parseParamsFromResultString(trim($elementData['searchParams']));
-            end($params);
-            $filterLink .= '&' . key($params) . '=';
+            $filterLink .= '&filter' . $elementData['associatedFieldName'] . '=';
 
             $filter = FF::getInstance('asnSliderFilter',
                 $filterLink,

lib/FACTFinder/Xml65/SearchAdapter.php

@@ -267,10 +267,7 @@ protected function createFilter($xmlFilter, $group, $encodingHandler, $params)
         $filterLink = $this->createLink($xmlFilter);
 
         if ($group->isSliderStyle()) {
-            // get last (empty) parameter from the search params property
-            $params = $this->getParamsParser()->parseParamsFromResultString(trim($xmlFilter->searchParams));
-            end($params);
-            $filterLink .= '&' . key($params) . '=';
+            $filterLink .= '&filter' . strval($xmlFilter->attributes()->field) . '=';
 
             $filter = FF::getInstance('asnSliderFilter',
                 $filterLink,