From b103d16eb1a9182715b808d913f964abd9f783be Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Mon, 8 Jul 2013 15:48:37 -0400
Subject: Fix loading some older compat flags and showing noexpire on /ns info

---
 src/nickalias.cpp | 8 ++++++++
 src/nickcore.cpp  | 6 +-----
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src')

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");
-- 
cgit