Revert "AccountManager: take theURL from the Theme rather than from the config if...

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 7e5d89293d7bd52ac42d026d34a8154fbbdf33bb.

diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index 590bfb692f7e354bd0454ea8f533ea28c3880953..0b5eed458829eb8e9deb26abbc851cac711bd3e3 100644 (file)
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -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));