Fix empty delimiter in isSpider()

[mailer.git] / inc / modules / guest / what-login.php

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 8fca859c58464bcb5f41d29c7c57a68ce4d8053f..94904e1be4459483357de4321a660e83b2585e9a 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -63,7 +63,7 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
        $userid = getMemberId();
 } elseif ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password')) && (isFormSent())) {
        // Set userid and crypt password when login data was submitted
-       if (isNicknameUsed(postRequestElement('id'))) {
+       if ((isExtensionActive('nickname')) && (isNicknameUsed(postRequestElement('id')))) {
                // Nickname entered
                $userid = SQL_ESCAPE(postRequestElement('id'));
        } else {
@@ -73,7 +73,7 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 } elseif (isPostRequestElementSet('new_pass')) {
        // New password requested
        $userid = '0';
-       if (isPostRequestElementSet('id')) $userid = bigintval(postRequestElement('id'));
+       if ((isPostRequestElementSet('id')) && (postRequestElement('id') > 0)) $userid = bigintval(postRequestElement('id'));
 } else {
        // Not logged in
        $userid = '0'; $hash = '';