diff options
| author | Christian Kamm <mail@ckamm.de> | 2017-10-25 12:54:52 +0300 |
|---|---|---|
| committer | Markus Goetz <markus@woboq.com> | 2017-11-01 17:57:58 +0300 |
| commit | 64a84fda38ce595cacb9e5cb1ad831a123303fee (patch) | |
| tree | e1bece07c45cd5ba3b2487d1a2664849b32bcbda /src/gui/owncloudsetupwizard.cpp | |
| parent | 8eec79680c79b55525df0f998a5b4f8f0f1ce36d (diff) | |
Wizard: Don't report confusing error message #6116
For historical reasons CheckServerJob doesn't just check url/ but also
url/owncloud/. However, that means if url/status.php is a 404 and
url/owncloud/status.php is a 404, the user will see the latter url
appear in the error message. That's potentially confusing.
Instead, just show the account url which will be closer to what the
user typed into the account wizard, while being adjusted for protocol
and possible redirects.
Diffstat (limited to 'src/gui/owncloudsetupwizard.cpp')
| -rw-r--r-- | src/gui/owncloudsetupwizard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp index e4e46f4f2..6b8ef6db9 100644 --- a/src/gui/owncloudsetupwizard.cpp +++ b/src/gui/owncloudsetupwizard.cpp @@ -279,7 +279,7 @@ void OwncloudSetupWizard::slotNoServerFound(QNetworkReply *reply) } else { msg = tr("Failed to connect to %1 at %2:<br/>%3") .arg(Utility::escape(Theme::instance()->appNameGUI()), - Utility::escape(reply->url().toString()), + Utility::escape(_ocWizard->account()->url().toString()), Utility::escape(job->errorString())); } bool isDowngradeAdvised = checkDowngradeAdvised(reply); |