diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-09 21:34:38 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-09 21:34:38 +0000 |
| commit | 06ade41bd892f72c907d6e5f12a8794fce32a465 (patch) | |
| tree | 0c10dbee65821d97d92084d5b6859ff1098243eb | |
| parent | 6f06729b24a80951b28bea3b2d2262f578eb9f74 (diff) | |
| parent | b8e8b9c665eb93a6053169997b70301aae8b0dc0 (diff) | |
Merge branch 'release/0.5' into develop
| -rw-r--r-- | config/general.yml-example | 4 | ||||
| -rw-r--r-- | vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/general.yml-example b/config/general.yml-example index a0d9dc705..86399f0bc 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -134,6 +134,6 @@ HTML_TO_PDF_COMMAND: /usr/local/bin/wkhtmltopdf-amd64 # Exception notifications EXCEPTION_NOTIFICATIONS_FROM: do-not-reply-to-this-address@example.com EXCEPTION_NOTIFICATIONS_TO: -- robin@example.org -- seb@example.org + - robin@example.org + - seb@example.org 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 592784ba1..39cfe929f 100644 --- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb +++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb @@ -218,7 +218,7 @@ module ActsAsXapian full_path = @@db_path + suffix # for indexing - @@writable_db = Xapian::flint_open(full_path, Xapian::DB_CREATE_OR_OPEN) + @@writable_db = Xapian::WritableDatabase.new(full_path, Xapian::DB_CREATE_OR_OPEN) @@enquire = Xapian::Enquire.new(@@writable_db) @@term_generator = Xapian::TermGenerator.new() @@term_generator.set_flags(Xapian::TermGenerator::FLAG_SPELLING, 0) |