diff options
| author | Sadie Powell <sadie@witchery.services> | 2024-11-11 17:10:24 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2024-11-11 17:13:01 +0000 |
| commit | df1c6176b38eea8d8889604699012ac8b172e341 (patch) | |
| tree | 73a467a7df0882541cd4f9cb5e249972647283f5 /src | |
| parent | 8634594cd1a11d6786e7da44679483718f47cc09 (diff) | |
| parent | 96ccfe4cbe9948206ac2d6854778f9a268d2476f (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'src')
| -rw-r--r-- | src/language.cpp | 2 | ||||
| -rw-r--r-- | src/memos.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/language.cpp b/src/language.cpp index 4ff190b35..bcade6ff1 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -62,7 +62,7 @@ const char *Language::Translate(const char *string) const char *Language::Translate(User *u, const char *string) { - if (u && u->Account()) + if (u && u->IsIdentified()) return Translate(u->Account(), string); else return Translate("", string); diff --git a/src/memos.cpp b/src/memos.cpp index 3aaded57d..e8b58df85 100644 --- a/src/memos.cpp +++ b/src/memos.cpp @@ -115,7 +115,7 @@ bool MemoInfo::HasIgnore(User *u) { for (const auto &ignore : this->ignores) { - if (u->nick.equals_ci(ignore) || (u->Account() && u->Account()->display.equals_ci(ignore)) || Anope::Match(u->GetMask(), Anope::string(ignore))) + if (u->nick.equals_ci(ignore) || (u->IsIdentified() && u->Account()->display.equals_ci(ignore)) || Anope::Match(u->GetMask(), Anope::string(ignore))) return true; } return false; |