[Pkg-owncloud-commits] [owncloud-client] 18/171: Wizard: Find user:pw even if redirected #4265

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit fe75c6ad288c4ef4c43d54c63daa0ee6bd96a45e
Author: Christian Kamm <mail at ckamm.de>
Date:   Wed Dec 9 14:45:50 2015 +0100

    Wizard: Find user:pw even if redirected #4265
---
 src/gui/wizard/owncloudhttpcredspage.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/gui/wizard/owncloudhttpcredspage.cpp b/src/gui/wizard/owncloudhttpcredspage.cpp
index 09f05f9..30d8391 100644
--- a/src/gui/wizard/owncloudhttpcredspage.cpp
+++ b/src/gui/wizard/owncloudhttpcredspage.cpp
@@ -81,6 +81,13 @@ void OwncloudHttpCredsPage::initializePage()
     } else {
         QUrl url = ocWizard->account()->url();
 
+        // If the final url does not have a username, check the
+        // user specified url too. Sometimes redirects can lose
+        // the user:pw information.
+        if (url.userName().isEmpty()) {
+            url = ocWizard->ocUrl();
+        }
+
         const QString user = url.userName();
         const QString password = url.password();
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git