summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/commands/cs_sync.cpp2
-rw-r--r--modules/database/db_mysql.cpp4
-rw-r--r--modules/database/db_plain.cpp4
3 files changed, 3 insertions, 7 deletions
diff --git a/modules/commands/cs_sync.cpp b/modules/commands/cs_sync.cpp
index 72964b786..2a6f7b6ef 100644
--- a/modules/commands/cs_sync.cpp
+++ b/modules/commands/cs_sync.cpp
@@ -29,7 +29,7 @@ class CommandCSSync : public Command
source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
else if (ci->c == NULL)
source.Reply(CHAN_X_NOT_IN_USE, params[0].c_str());
- else if (!ci->AccessFor(u).HasPriv(CA_ACCESS_CHANGE))
+ else if (!ci->AccessFor(u).HasPriv("ACCESS_CHANGE"))
source.Reply(ACCESS_DENIED);
else
{
diff --git a/modules/database/db_mysql.cpp b/modules/database/db_mysql.cpp
index 4a9c52202..e03c89d16 100644
--- a/modules/database/db_mysql.cpp
+++ b/modules/database/db_mysql.cpp
@@ -1538,11 +1538,7 @@ static void SaveDatabases()
me->OnAkickAdd(ci, ak);
}
-<<<<<<< HEAD
- me->OnLevelChange(NULL, ci, -1, -1);
-=======
me->OnLevelChange(NULL, ci, "ALL", -1);
->>>>>>> 348a3db... Allow modules to add their own channel levels
for (unsigned j = 0, end = ci->memos.memos.size(); j < end; ++j)
{
diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp
index fffa02c87..bf0b05e3d 100644
--- a/modules/database/db_plain.cpp
+++ b/modules/database/db_plain.cpp
@@ -580,14 +580,14 @@ class DBPlain : public Module
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;
+ time_t mcreated = 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)));
+ ci->mode_locks.insert(std::make_pair(n, ModeLock(set, n, param, setter, mcreated)));
break;
}
}