Fix option filters not working in pagination

This fixes an issue where some option filters like `map_position` and `grid_view` are dropped when using the pagination links.
SimplyRETS · Feb 27, 2024 · cc78d81 · cc78d81
1 parent 706d81e
commit cc78d81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/simply-rets-api-helper.php b/src/simply-rets-api-helper.php
@@ -15,7 +15,7 @@ class SimplyRetsApiHelper {
     public static function retrieveRetsListings( $params, $settings = NULL ) {
         $request_url      = SimplyRetsApiHelper::srRequestUrlBuilder( $params );
         $request_response = SimplyRetsApiHelper::srApiRequest( $request_url );
-        $response_markup  = SimplyRetsApiHelper::srResidentialResultsGenerator($request_response, $settings, $params);
+        $response_markup  = SimplyRetsApiHelper::srResidentialResultsGenerator($request_response, $settings);
 
         return $response_markup;
     }
@@ -1371,7 +1371,7 @@ public static function resultDataColumnMarkup($val, $name, $reverse=false, $id="
     }
 
 
-    public static function srResidentialResultsGenerator($request_response, $settings, $params = array()) {
+    public static function srResidentialResultsGenerator($request_response, $settings) {
         $cont              = "";
         $pagination        = $request_response['pagination'];
         $lastUpdate        = $request_response['lastUpdate'];
@@ -1391,7 +1391,7 @@ public static function srResidentialResultsGenerator($request_response, $setting
 
         /** Build pagination links HTML **/
         $page_count = count($response);
-        $limit = isset($params['limit']) ? $params['limit'] : 20;
+        $limit = isset($settings['limit']) ? $settings['limit'] : 20;
         $pag = SrUtils::buildPaginationLinks( $pagination );
         $prev_link = $pag['prev'];
         $next_link = $page_count < $limit ? "" : $pag['next'];

diff --git a/src/simply-rets-shortcode.php b/src/simply-rets-shortcode.php
@@ -235,7 +235,6 @@ public static function parseShortcodeAttributes($atts, $setting_atts = array())
             // Parse settings, don't add them to the API query
             if (array_key_exists($param, $setting_atts)) {
                 $attributes["settings"][$param] = $value;
-                continue;
             }
 
             $values = explode(";", $value);
@@ -244,11 +243,6 @@ public static function parseShortcodeAttributes($atts, $setting_atts = array())
             }
 
             $attributes["params"][$name] = count($values) > 1 ? $values : $value;
-
-            // Add vendor to params and settings
-            if ($param === "vendor") {
-                $attributes["settings"]["vendor"] = $value;
-            }
         }
 
         return $attributes;
@@ -276,6 +270,8 @@ public static function sr_residential_shortcode($atts = array ()) {
             "map_position" => get_option('sr_search_map_position', 'map_above'),
             "show_map" => "true",
             "grid_view" => false,
+            "vendor" => "",
+            "limit" => 20
         );
 
         $data = SrShortcodes::parseShortcodeAttributes($atts, $setting_atts);