diff options
| author | Adam <Adam@anope.org> | 2015-10-27 18:57:37 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2015-10-27 18:58:48 -0400 |
| commit | 64dac60071fab652745a6e7a06cf6b7bdbbd3625 (patch) | |
| tree | f8f30161150451672b381f6370a8fdcab654bbb8 /modules/database | |
| parent | 162fdbe5815bbdf187f549fefac94ff476d72e62 (diff) | |
| parent | 830361e97d03c74e54cb1cf1bbf329dffdeb66f7 (diff) | |
Merge branch '2.0' into 2.1
Diffstat (limited to 'modules/database')
| -rw-r--r-- | modules/database/db_flatfile.cpp | 2 | ||||
| -rw-r--r-- | modules/database/db_old.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp index 2486a2307..122134960 100644 --- a/modules/database/db_flatfile.cpp +++ b/modules/database/db_flatfile.cpp @@ -57,7 +57,7 @@ class DBFlatFile : public Module Anope::string err = Anope::LastError(); Log(this) << "Unable to back up database " << *it << " (" << err << ")!"; - if (!Config->GetModule(this)->Get<bool>("nobackupok")) + if (!Config->GetModule(this)->Get<bool>("nobackupokay")) { Anope::Quitting = true; Anope::QuitReason = "Unable to back up database " + *it + " (" + err + ")"; diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp index dff08250e..3d9b92922 100644 --- a/modules/database/db_old.cpp +++ b/modules/database/db_old.cpp @@ -723,7 +723,7 @@ static void LoadVHosts() NickServ::Nick *na = NickServ::FindNick(nick); if (na == NULL) { - Log() << "Removing vhost for nonexistant nick " << nick; + Log() << "Removing vhost for non-existent nick " << nick; continue; } |