disabled cookie check when alternate login url used; merged from MOODLE_15_STABLE

This commit is contained in:
skodak
2005-07-05 17:16:21 +00:00
parent 269ecdac44
commit 96b5658136
+1 -1
View File
@@ -85,7 +85,7 @@
/// Check if the user has actually submitted login data to us
if ($frm and (get_moodle_cookie() == '') and ($frm->username!='guest') and !$user) { // Login without cookie
if ($frm and (get_moodle_cookie() == '') and ($frm->username!='guest') and !$user and empty($CFG->alternateloginurl)) { // Login without cookie
$errormsg = get_string("cookiesnotenabled");