Skip to content
Browse files

Merge branch 'v1'

Conflicts:
	HISTORY
  • Loading branch information...
2 parents 591385f + 67ff4b0 commit 53fbf07b81e8fa4080acc1d95be293ded10ac13a @pat pat committed
Showing with 4 additions and 1 deletion.
  1. +3 −0 HISTORY
  2. +1 −1 lib/thinking_sphinx/search.rb
View
3 HISTORY
@@ -1,3 +1,6 @@
+Edge:
+* Allow for rank_expr option being passed through to Riddle.
+
2.0.11 - January 2nd 2011
* Call #all on search results to force population of results, matching ActiveRecord::Relation#all in essence. (Adrian Macneil).
* 1.4.11 changes.
View
2 lib/thinking_sphinx/search.rb
@@ -544,7 +544,7 @@ def prepare(client)
[
:max_matches, :group_by, :group_function, :group_clause,
:group_distinct, :id_range, :cut_off, :retry_count, :retry_delay,
- :rank_mode, :max_query_time, :field_weights
+ :rank_mode, :rank_expr, :max_query_time, :field_weights
].each do |key|
value = options[key] || index_options[key]
client.send("#{key}=", value) if value

0 comments on commit 53fbf07

Please sign in to comment.
Something went wrong with that request. Please try again.