diff options
| author | Adam <Adam@anope.org> | 2013-07-08 15:48:37 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-07-08 15:48:37 -0400 |
| commit | b103d16eb1a9182715b808d913f964abd9f783be (patch) | |
| tree | 7b770a89a95c8672e79bbfed06aae1d84ea2975c | |
| parent | e3b6ae3649fdec00890efb0dea6382651452d869 (diff) | |
Fix loading some older compat flags and showing noexpire on /ns info
| -rw-r--r-- | modules/commands/ns_set.cpp | 2 | ||||
| -rw-r--r-- | src/nickalias.cpp | 8 | ||||
| -rw-r--r-- | src/nickcore.cpp | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/modules/commands/ns_set.cpp b/modules/commands/ns_set.cpp index 08cf3966a..6f47750cb 100644 --- a/modules/commands/ns_set.cpp +++ b/modules/commands/ns_set.cpp @@ -1156,7 +1156,7 @@ class NSSet : public Module info.AddOption(_("Auto-op")); if (chanstats.HasExt(na->nc)) info.AddOption(_("Chanstats")); - if (noexpire.HasExt(na->nc)) + if (noexpire.HasExt(na)) info.AddOption(_("No expire")); } }; diff --git a/src/nickalias.cpp b/src/nickalias.cpp index a50284cf4..488017346 100644 --- a/src/nickalias.cpp +++ b/src/nickalias.cpp @@ -201,6 +201,14 @@ Serializable* NickAlias::Unserialize(Serializable *obj, Serialize::Data &data) na->SetVhost(vhost_ident, vhost_host, vhost_creator, vhost_time); + /* compat */ + bool b; + b = false; + data["extensible:NO_EXPIRE"] >> b; + if (b) + na->Extend<bool>("NS_NO_EXPIRE"); + /* end compat */ + return na; } diff --git a/src/nickcore.cpp b/src/nickcore.cpp index 9d032cacb..57d7ad41d 100644 --- a/src/nickcore.cpp +++ b/src/nickcore.cpp @@ -122,7 +122,7 @@ Serializable* NickCore::Unserialize(Serializable *obj, Serialize::Data &data) if (b) nc->Extend<bool>("NS_PRIVATE"); b = false; - data["exensible:AUTOOP"] >> b; + data["extensible:AUTOOP"] >> b; if (b) nc->Extend<bool>("AUTOOP"); b = false; @@ -142,10 +142,6 @@ Serializable* NickCore::Unserialize(Serializable *obj, Serialize::Data &data) if (b) nc->Extend<bool>("MEMO_SIGNON"); b = false; - data["extensible:NO_EXPIRE"] >> b; - if (b) - nc->Extend<bool>("NO_EXPIRE"); - b = false; data["extensible:KILLPROTECT"] >> b; if (b) nc->Extend<bool>("KILLPROTECT"); |