2 files changed, 26 insertions, 17 deletions

diff --git a/modules/database/db_mysql.cpp b/modules/database/db_mysql.cpp
index 19d41bb6e..a90276274 100644
--- a/modules/database/db_mysql.cpp
+++ b/modules/database/db_mysql.cpp
@@ -512,14 +512,19 @@ class DBMySQL : public Module
 				continue;
 			}
 
-			std::vector<Anope::string> mlocks;
-			ci->GetExtRegular("db_mlock", mlocks);
-
-			Anope::string modestring = r.Get(i, "status") + " " + r.Get(i, "mode") + " " + r.Get(i, "setter") + " " + r.Get(i, "created") + " " + r.Get(i, "param");
-
-			mlocks.push_back(modestring);
-
-			ci->Extend("db_mlock", new ExtensibleItemRegular<std::vector<Anope::string> >(mlocks));
+			Anope::string mode_name = r.Get(i, "mode");
+			bool set = r.Get(i, "status") == "1" ? true : false;
+			Anope::string setter = r.Get(i, "setter");
+			time_t mcreated = r.Get(i, "created").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "created")) : Anope::CurTime;
+			Anope::string param = r.Get(i, "param");
+
+			for (size_t j = CMODE_BEGIN + 1; j < CMODE_END; ++j)
+				if (ChannelModeNameStrings[j] == mode_name)
+				{
+					ChannelModeName n = static_cast<ChannelModeName>(j);
+					ci->mode_locks.insert(std::make_pair(n, ModeLock(set, n, param, setter, mcreated)));
+					break;
+				}
 		}
 
 		query = "SELECT * FROM `anope_ms_info`";
diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp
index d2433b6fe..340775e0c 100644
--- a/modules/database/db_plain.cpp
+++ b/modules/database/db_plain.cpp
@@ -606,15 +606,19 @@ class DBPlain : public Module
 			}
 			else if (key.equals_ci("MLOCK"))
 			{
-				std::vector<Anope::string> mlocks;
-				ci->GetExtRegular("db_mlock", mlocks);
-
-				Anope::string mlock_string = params[0] + " " + params[1] + " " + params[2] + " " + params[3];
-				if (params.size() > 4)
-					mlock_string += " " +  params[4];
-
-				mlocks.push_back(mlock_string);
-				ci->Extend("db_mlock", new ExtensibleItemRegular<std::vector<Anope::string> >(mlocks));
+				bool set = params[0] == "1" ? true : false;
+				Anope::string mode_name = params[1];
+				Anope::string setter = params[2];
+				time_t created = params[3].is_pos_number_only() ? convertTo<time_t>(params[3]) : Anope::CurTime;
+				Anope::string param = params.size() > 4 ? params[4] : "";
+
+				for (size_t i = CMODE_BEGIN + 1; i < CMODE_END; ++i)
+					if (ChannelModeNameStrings[i] == mode_name)
+					{
+						ChannelModeName n = static_cast<ChannelModeName>(i);
+						ci->mode_locks.insert(std::make_pair(n, ModeLock(set, n, param, setter, created)));
+						break;
+					}
 			}
 			else if (key.equals_ci("MI"))
 			{