Updating Riddle

purcell · Dec 2, 2009 · bb84548 · bb84548
1 parent 3d89f1e
commit bb84548
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/vendor/riddle/lib/riddle.rb b/vendor/riddle/lib/riddle.rb
@@ -19,11 +19,11 @@ def self.escape(string)
   end
 
   def self.loaded_version
-    Thread.current[:riddle_sphinx_version]
+    @@sphinx_version
   end
 
   def self.loaded_version=(version)
-    Thread.current[:riddle_sphinx_version] = version
+    @@sphinx_version = version
   end
 
   def self.version_warning
@@ -47,4 +47,5 @@ def self.version_warning
 require 'riddle/configuration'
 require 'riddle/controller'
 
+Riddle.loaded_version = nil
 Riddle::AutoVersion.configure
diff --git a/vendor/riddle/lib/riddle/controller.rb b/vendor/riddle/lib/riddle/controller.rb
@@ -12,14 +12,9 @@ def initialize(configuration, path)
     end
 
     def sphinx_version
-      stderr      = $stderr.dup
-      read, write = IO.pipe
-      $stderr.reopen(write)
-      `#{indexer}`[/^Sphinx (\d\.\d\.\d)/, 1]
+      `#{indexer} 2>&1`[/^Sphinx (\d\.\d\.\d)/, 1]
     rescue
       nil
-    ensure
-      $stderr.reopen(stderr)
     end
 
     def index(*indexes)