fixed https://phabricator.wikimedia.org/T218601

huggle · Jun 25, 2019 · 5cb0cb2 · 5cb0cb2
1 parent a262448
commit 5cb0cb2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/huggle_core/userconfiguration.cpp b/src/huggle_core/userconfiguration.cpp
@@ -96,6 +96,14 @@ Huggle::UserConfiguration::~UserConfiguration()
     }
 }
 
+void UserConfiguration::SetDefaults(ProjectConfiguration *ProjectConfig)
+{
+    this->DefaultSummary = ProjectConfig->DefaultSummary;
+    this->RollbackSummary = ProjectConfig->RollbackSummary;
+    this->RollbackSummaryUnknownTarget = ProjectConfig->RollbackSummaryUnknownTarget;
+    this->WelcomeGood = ProjectConfig->WelcomeGood;
+}
+
 HuggleOption *UserConfiguration::GetOption(const QString& key)
 {
     if (this->UserOptions.contains(key))

diff --git a/src/huggle_core/userconfiguration.hpp b/src/huggle_core/userconfiguration.hpp
@@ -59,6 +59,8 @@ namespace Huggle
 
             UserConfiguration();
             ~UserConfiguration();
+            //! In case there is no user config on wiki yet, Parse is not called at all so we need to initialize this user config with defaults from project
+            void SetDefaults(ProjectConfiguration *ProjectConfig);
             //! This function is obsolete and used only to read the old format huggle3.css file, new versions should only use YAML formats
             bool Parse(const QString& config, ProjectConfiguration *ProjectConfig, bool IsHome);
             bool ParseYAML(const QString &config, ProjectConfiguration *ProjectConfig, bool IsHome, QString *error);

diff --git a/src/huggle_ui/loginform.cpp b/src/huggle_ui/loginform.cpp
@@ -937,6 +937,8 @@ void LoginForm::retrieveUserConfig(WikiSite *site)
                     q->DecRef();
                     this->LoginQueries.remove(site);
                     this->Statuses[site] = RetrievingUser;
+                    // initialize user config with default values taken from project
+                    site->GetUserConfig()->SetDefaults(site->GetProjectConfig());
                     return;
                 }
                 HUGGLE_DEBUG1(q->Result->Data);