Merge branch 'release/0.16'0.16

1 files changed, 25 insertions, 0 deletions

diff --git a/config/initializers/acts_as_xapian.rb b/config/initializers/acts_as_xapian.rb
new file mode 100644
index 000000000..f82193c85
--- /dev/null
+++ b/config/initializers/acts_as_xapian.rb
@@ -0,0 +1,25 @@
+# acts_as_xapian/init.rb:
+#
+# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
+# Email: hello@mysociety.org; WWW: http://www.mysociety.org/
+
+# We're moving plugins out of vendor/plugins, since keeping them there
+# is deprecated as of Rails 3.2, and the xapiandbs directory should be
+# moved out of there along with the plugin itself.
+
+old_xapiandbs_path = Rails.root.join('vendor',
+                                     'plugins',
+                                     'acts_as_xapian',
+                                     'xapiandbs')
+
+current_xapiandbs_path = Rails.root.join('lib',
+                                         'acts_as_xapian',
+                                         'xapiandbs')
+
+if File.exists? old_xapiandbs_path
+    unless File.exists? current_xapiandbs_path
+        File.rename old_xapiandbs_path, current_xapiandbs_path
+    end
+end
+
+require 'acts_as_xapian/acts_as_xapian'