mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 23:17:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "AccountManager: take theURL from the Theme rather than from the config if the theme specify it"

Browse source 
The URL may change from shiboleth to normal authentication method.
Also some people were changing the config file manually to test stuff

Issue https://github.com/owncloud/enterprise/issues/1113

This reverts commit 7e5d89293d.
This commit is contained in:
Olivier Goffart 2016-02-25 11:33:26 +01:00
parent 8222295ab1
commit 1fafb1325b
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gui/accountmanager.cpp
View file

@ -194,14 +194,7 @@ AccountPtr AccountManager::load(QSettings& settings)
{
auto acc = createAccount();
QString overrideUrl = Theme::instance()->overrideServerUrl();
if( !overrideUrl.isEmpty() ) {
// if there is a overrideUrl, don't even bother reading from the config as all the accounts
// must use the overrideUrl
acc->setUrl(overrideUrl);
} else {
acc->setUrl(settings.value(QLatin1String(urlC)).toUrl());
}
acc->setUrl(settings.value(QLatin1String(urlC)).toUrl());
// We want to only restore settings for that auth type and the user value
acc->_settingsMap.insert(QLatin1String(userC), settings.value(userC));