diff options
| author | Adam <Adam@anope.org> | 2014-05-28 12:11:45 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2014-05-28 12:22:39 -0400 |
| commit | f97e339314257fa37cfcab0c2289fb6812e32e85 (patch) | |
| tree | a1c9d352a771e0bb7d39d42178a7246d6f2c5434 /include | |
| parent | f29e1cf383529a1a29f02b0669d973f5ee0b7a66 (diff) | |
| parent | ba46b8e4abd8fef991732d5c52c858a229894a25 (diff) | |
Merge branch '2.0' into 2.1
Conflicts:
.travis.yml
src/config.cpp
src/version.sh
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 1 | ||||
| -rw-r--r-- | include/extensible.h | 4 | ||||
| -rw-r--r-- | include/language.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/config.h b/include/config.h index 3d0133409..585c681fb 100644 --- a/include/config.h +++ b/include/config.h @@ -131,6 +131,7 @@ namespace Configuration ~Conf(); void LoadConf(File &file); + void Post(Conf *old); Block *GetModule(Module *); Block *GetModule(const Anope::string &name); diff --git a/include/extensible.h b/include/extensible.h index ef429b919..7f392ab8a 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -175,6 +175,8 @@ class SerializableExtensibleItem : public PrimitiveExtensibleItem<T> T t; if (data[this->name] >> t) this->Set(e, t); + else + this->Unset(e); } }; @@ -195,6 +197,8 @@ class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool> data[this->name] >> b; if (b) this->Set(e); + else + this->Unset(e); } }; diff --git a/include/language.h b/include/language.h index 55726b8d6..0aaa5ac9c 100644 --- a/include/language.h +++ b/include/language.h @@ -107,7 +107,7 @@ namespace Language #define CHAN_SETTING_UNSET _("%s for %s unset.") #define CHAN_ACCESS_LEVEL_RANGE _("Access level must be between %d and %d inclusive.") #define CHAN_INFO_HEADER _("Information for channel \002%s\002:") -#define CHAN_EXCEPTED _("\002%s\002 matches an except on %s and cannot be banned until the except have been removed.") +#define CHAN_EXCEPTED _("\002%s\002 matches an except on %s and cannot be banned until the except has been removed.") #define MEMO_NEW_X_MEMO_ARRIVED _("There is a new memo on channel %s.\n" \ "Type \002%s%s READ %s %d\002 to read it.") #define MEMO_NEW_MEMO_ARRIVED _("You have a new memo from %s.\n" \ |