Rewrite continued:

[core.git] / framework / main / classes / filter / auth / class_UserAuthFilter.php

diff --git a/framework/main/classes/filter/auth/class_UserAuthFilter.php b/framework/main/classes/filter/auth/class_UserAuthFilter.php
index 63bcc49c3f58572d27062ea8fbc38e0e5a85c3f9..2f0b5539f44ae924d2bfe5926b2793ab447cb810 100644 (file)
--- a/framework/main/classes/filter/auth/class_UserAuthFilter.php
+++ b/framework/main/classes/filter/auth/class_UserAuthFilter.php
@@ -92,9 +92,6 @@ class UserAuthFilter extends BaseFilter implements Filterable {
                // Then get an auth instance for checking and updating the auth cookies
                $authInstance = ObjectFactory::createObjectByName($this->authMethod, array($responseInstance));
 
                // Then get an auth instance for checking and updating the auth cookies
                $authInstance = ObjectFactory::createObjectByName($this->authMethod, array($responseInstance));
 

-               // Set request instance
-               $authInstance->setRequestInstance($requestInstance);
-

                // Now, get the auth data for comparison
                $authLogin = $authInstance->getUserAuth();
                $authHash  = $authInstance->getPasswordAuth();
                // Now, get the auth data for comparison
                $authLogin = $authInstance->getUserAuth();
                $authHash  = $authInstance->getPasswordAuth();


@@ -105,7 +102,7 @@ class UserAuthFilter extends BaseFilter implements Filterable {
                        $authInstance->destroyAuthData();
 
                        // Mark the request as invalid
                        $authInstance->destroyAuthData();
 
                        // Mark the request as invalid

-                       $requestInstance->requestIsValid(FALSE);
+                       $requestInstance->requestIsValid(false);

 
                        // Add fatal message
                        $responseInstance->addFatalMessage('auth_data_incomplete');
 
                        // Add fatal message
                        $responseInstance->addFatalMessage('auth_data_incomplete');