Merge pull request #162 from peterkeung/fix-limitation-param

Fix for EZP-22924: eZ Find fetch does not respect limitation parameter
ezsystems · May 26, 2014 · 8585286 · 8585286
2 parents 82bf155 + 79c7739
commit 8585286
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/search/plugins/ezsolr/ezsolr.php b/search/plugins/ezsolr/ezsolr.php
@@ -976,7 +976,7 @@ function search( $searchText, $params = array(), $searchTypes = array() )
         {
             $searchCount = $resultArray[ 'response' ][ 'numFound' ];
             $objectRes = $this->buildResultObjects(
-                $resultArray, $searchCount, $asObjects, $params['FieldsToReturn']
+                $resultArray, $searchCount, $asObjects, $params
             );
 
             $stopWordArray = array();
@@ -1061,7 +1061,7 @@ function moreLikeThis( $queryType, $queryValue, $params = array() )
         {
             $searchCount = $resultArray[ 'response' ][ 'numFound' ];
             $objectRes = $this->buildResultObjects(
-                $resultArray, $searchCount, $asObjects
+                $resultArray, $searchCount, $asObjects, $params
             );
 
             $stopWordArray = array();
@@ -1477,7 +1477,7 @@ public function pushElevateConfiguration()
      * @see eZSolrBase::search
      * @see eZSolrBase::moreLikeThis
      */
-    protected function buildResultObjects( $resultArray, &$searchCount, $asObjects = true, $fieldsToReturn = array() )
+    protected function buildResultObjects( $resultArray, &$searchCount, $asObjects = true, $params = array() )
     {
         $objectRes = array();
         $highLights = array();
@@ -1555,7 +1555,7 @@ protected function buildResultObjects( $resultArray, &$searchCount, $asObjects =
                         }
                         // it may be a field originating from the explicit fieldlist to return, so it should be added for template consumption
                         // note that the fieldname will be kept verbatim in a substructure 'fields'
-                        elseif( in_array( $fieldName, $fieldsToReturn ) )
+                        elseif( in_array( $fieldName, $params['FieldsToReturn'] ) )
                         {
                             $emit['fields'][$fieldName] = $fieldValue;
                         }