Merge branch '1.6.x'

Conflicts:
	modules/cyrusauth.cpp
	modules/keepnick.cpp
	modules/notes.cpp
This commit is contained in:
Alexey Sokolov
2015-10-30 14:56:28 +00:00
11 changed files with 32 additions and 34 deletions

View File

@@ -19,7 +19,7 @@
using std::stringstream;
class CNotesMod : public CModule {
bool bShowNotesOnLogin;
bool m_bShowNotesOnLogin{};
void ListCommand(const CString &sLine) {
ListNotes();
@@ -85,14 +85,14 @@ public:
virtual ~CNotesMod() {}
bool OnLoad(const CString& sArgs, CString& sMessage) override {
bShowNotesOnLogin = !sArgs.Equals("-disableNotesOnLogin");
m_bShowNotesOnLogin = !sArgs.Equals("-disableNotesOnLogin");
return true;
}
CString GetWebMenuTitle() override { return "Notes"; }
void OnClientLogin() override {
if (bShowNotesOnLogin) {
if (m_bShowNotesOnLogin) {
ListNotes(true);
}
}