diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-08-22 14:11:02 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-08-22 14:19:05 +0100 |
| commit | 5c3881bfacdb34a605ddfbadf1531d0e341d7beb (patch) | |
| tree | 088e752d1a6d2fb38d1409dbfb1cb332af92594c /vendor | |
| parent | 15a174375e638b91c138d771d4851613110f9cdc (diff) | |
| parent | a29b3aaf0ae77af49d38813b62dddcb6889c1ebe (diff) | |
merge from master and make tests pass
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb | 2 | ||||
| m--------- | vendor/rails | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb index 1769b2aef..43f0764ca 100644 --- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb +++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb @@ -220,7 +220,7 @@ module ActsAsXapian raise "writable_suffix/suffix inconsistency" if @@writable_suffix && @@writable_suffix != suffix # for indexing - @@writable_db = Xapian::Flint::WritableDatabase.new(full_path, Xapian::DB_CREATE_OR_OPEN) + @@writable_db = Xapian::flint_open(full_path, Xapian::DB_CREATE_OR_OPEN) @@term_generator = Xapian::TermGenerator.new() @@term_generator.set_flags(Xapian::TermGenerator::FLAG_SPELLING, 0) @@term_generator.database = @@writable_db diff --git a/vendor/rails b/vendor/rails -Subproject 6c42c142e2a41e6b9b05cfc2d7e1d316c38869c +Subproject e0774e47302a907319ed974ccf59b8b54d32bbd |