mod/pointer/set/abstract/00_paging_params.rb in card-1.93.5 vs mod/pointer/set/abstract/00_paging_params.rb in card-1.93.6

@@ -1,11 +1,24 @@
 format do
   def limit_param
-    @limit ||=
-      Env.params[:limit].present? ? Env.params.delete(:limit).to_i : default_limit
+    @limit ||= contextual_param(:limit) || default_limit
   end
 
   def offset_param
-    @offset ||=
-      Env.params[:offset].present? ? Env.params.delete(:offset).to_i : 0
+    @offset ||= contextual_param(:offset) || 0
+  end
+
+  def contextual_param param
+    env_search_param(param) || voo_search_param(param)
+  end
+
+  def env_search_param param
+    return unless focal?
+    val = Env.params[param]
+    val.present? && val.to_i
+  end
+
+  def voo_search_param param
+    return unless voo&.wql
+    voo.wql[param]
   end
 end