diff --git a/checkin_notes b/checkin_notes index 4f948b37db..34a21b0b49 100644 --- a/checkin_notes +++ b/checkin_notes @@ -5581,3 +5581,9 @@ David 12 June 2009 sched/ start + +Rom 12 June 2009 + - MGR: The ReturnURL cookie is optional, not required. + + clientgui/ + browser.cpp diff --git a/clientgui/browser.cpp b/clientgui/browser.cpp index 045360ca06..992cad30e0 100644 --- a/clientgui/browser.cpp +++ b/clientgui/browser.cpp @@ -685,21 +685,33 @@ bool detect_account_manager_credentials( #ifdef _WIN32 if ( detect_cookie_ie(project_url, strCookieLogon, login) && - detect_cookie_ie(project_url, strCookiePasswordHash, password_hash) && - detect_cookie_ie(project_url, strCookieReturnURL, return_url) ) goto END; + detect_cookie_ie(project_url, strCookiePasswordHash, password_hash) + ){ + detect_cookie_ie(project_url, strCookieReturnURL, return_url); + goto END; + } #endif #ifdef __APPLE__ if ( detect_cookie_safari(project_url, strCookieLogon, login) && - detect_cookie_safari(project_url, strCookiePasswordHash, password_hash) && - detect_cookie_safari(project_url, strCookieReturnURL, return_url) ) goto END; + detect_cookie_safari(project_url, strCookiePasswordHash, password_hash) + ){ + detect_cookie_safari(project_url, strCookieReturnURL, return_url); + goto END; + } #endif if ( detect_cookie_firefox_3(project_url, strCookieLogon, login) && - detect_cookie_firefox_3(project_url, strCookiePasswordHash, password_hash) && - detect_cookie_firefox_3(project_url, strCookieReturnURL, return_url) ) goto END; + detect_cookie_firefox_3(project_url, strCookiePasswordHash, password_hash) + ){ + detect_cookie_firefox_3(project_url, strCookieReturnURL, return_url); + goto END; + } if ( detect_cookie_firefox_2(project_url, strCookieLogon, login) && - detect_cookie_firefox_2(project_url, strCookiePasswordHash, password_hash) && - detect_cookie_firefox_2(project_url, strCookieReturnURL, return_url) ) goto END; + detect_cookie_firefox_2(project_url, strCookiePasswordHash, password_hash) + ){ + detect_cookie_firefox_2(project_url, strCookieReturnURL, return_url); + goto END; + } END: if (!login.empty() && !password_hash.empty()) {