diff options
| -rw-r--r-- | src/nickalias.cpp | 6 | ||||
| -rw-r--r-- | src/nickcore.cpp | 9 | ||||
| -rw-r--r-- | src/regchannel.cpp | 9 |
3 files changed, 18 insertions, 6 deletions
diff --git a/src/nickalias.cpp b/src/nickalias.cpp index 29920b3cf..a0adcc378 100644 --- a/src/nickalias.cpp +++ b/src/nickalias.cpp @@ -158,7 +158,7 @@ void NickAlias::Type::Serialize(Serializable *obj, Serialize::Data &data) const data.Store("last_realname", na->last_realname); data.Store("last_usermask", na->last_usermask); data.Store("last_realhost", na->last_realhost); - data.Store("time_registered", na->registered); + data.Store("registered", na->registered); data.Store("last_seen", na->last_seen); data.Store("ncid", na->nc->GetId()); @@ -211,7 +211,7 @@ Serializable *NickAlias::Type::Unserialize(Serializable *obj, Serialize::Data &d data["last_realname"] >> na->last_realname; data["last_usermask"] >> na->last_usermask; data["last_realhost"] >> na->last_realhost; - data["time_registered"] >> na->registered; + data["registered"] >> na->registered; data["last_seen"] >> na->last_seen; Anope::string vhost_ident, vhost_host, vhost_creator; @@ -235,6 +235,8 @@ Serializable *NickAlias::Type::Unserialize(Serializable *obj, Serialize::Data &d // End 1.9 compatibility. // Begin 2.0 compatibility. + if (!na->registered) + data["time_registered"] >> na->registered; if (na->registered < na->nc->registered) na->nc->registered = na->registered; // End 2.0 compatibility. diff --git a/src/nickcore.cpp b/src/nickcore.cpp index 424b3e313..3f79dbf12 100644 --- a/src/nickcore.cpp +++ b/src/nickcore.cpp @@ -80,7 +80,7 @@ void NickCore::Type::Serialize(Serializable *obj, Serialize::Data &data) const data.Store("email", nc->email); data.Store("language", nc->language); data.Store("lastmail", nc->lastmail); - data.Store("time_registered", nc->registered); + data.Store("registered", nc->registered); data.Store("memomax", nc->memos.memomax); std::ostringstream oss; @@ -110,7 +110,7 @@ Serializable *NickCore::Type::Unserialize(Serializable *obj, Serialize::Data &da data["email"] >> nc->email; data["language"] >> nc->language; data["lastmail"] >> nc->lastmail; - data["time_registered"] >> nc->registered; + data["registered"] >> nc->registered; data["memomax"] >> nc->memos.memomax; { Anope::string buf; @@ -180,6 +180,11 @@ Serializable *NickCore::Type::Unserialize(Serializable *obj, Serialize::Data &da } // End 2.0 compatibility. + // Begin 2.1 compatibility. + if (!nc->registered) + data["time_registered"] >> nc->registered; + // End 2.1 compatibility. + return nc; } diff --git a/src/regchannel.cpp b/src/regchannel.cpp index 991cf90f8..73fb82d7f 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -196,7 +196,7 @@ void ChannelInfo::Type::Serialize(Serializable *obj, Serialize::Data &data) cons if (ci->successor) data.Store("successorid", ci->successor->GetId()); data.Store("description", ci->desc); - data.Store("time_registered", ci->registered); + data.Store("registered", ci->registered); data.Store("last_used", ci->last_used); data.Store("last_topic", ci->last_topic); data.Store("last_topic_setter", ci->last_topic_setter); @@ -244,7 +244,7 @@ Serializable *ChannelInfo::Type::Unserialize(Serializable *obj, Serialize::Data ci->SetSuccessor(ssuccessorid ? NickCore::FindId(ssuccessorid) : NickCore::Find(ssuccessor)); data["description"] >> ci->desc; - data["time_registered"] >> ci->registered; + data["registered"] >> ci->registered; data["last_used"] >> ci->last_used; data["last_topic"] >> ci->last_topic; data["last_topic_setter"] >> ci->last_topic_setter; @@ -328,6 +328,11 @@ Serializable *ChannelInfo::Type::Unserialize(Serializable *obj, Serialize::Data ci->Extend<bool>("SIGNKICK_LEVEL"); // End 1.9 compatibility. + // Begin 2.0 compatibility. + if (!ci->registered) + data["time_registered"] >> ci->registered; + // End 2.0 compatibility. + return ci; } |