NPE catched, command class added, beter coding practice applied:

[core.git] / inc / classes / main / user / class_BaseUser.php

diff --git a/inc/classes/main/user/class_BaseUser.php b/inc/classes/main/user/class_BaseUser.php
index 7943b7c27fb93749734c2975405f6b421a66614c..0aa89c354c6587ed574ab73fc8f815077ae6bf0f 100644 (file)
--- a/inc/classes/main/user/class_BaseUser.php
+++ b/inc/classes/main/user/class_BaseUser.php
@@ -51,10 +51,6 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);

-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();

        }
 
        /**
        }
 
        /**


@@ -245,13 +241,16 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
                        $this->setResultInstance($resultInstance);
                } // END - if
 
                        $this->setResultInstance($resultInstance);
                } // END - if
 

-               // Rewind it
+               // Rewind it and advance to first entry

                $this->getResultInstance()->rewind();
 
                $this->getResultInstance()->rewind();
 

+               // This call set the result instance to a clean state
+               $this->getResultInstance()->next();
+

                // Search for it
                if ($this->getResultInstance()->find('pass_hash')) {
                        // So does the hashes match?
                // Search for it
                if ($this->getResultInstance()->find('pass_hash')) {
                        // So does the hashes match?

-                       //* DEBUG: */ echo $requestInstance->getRequestElement('pass_hash').'/'.$entry['pass_hash'];
+                       //* DEBUG: */ echo $requestInstance->getRequestElement('pass_hash') . '<br />' . $this->getResultInstance()->getFoundValue() . '<br />';

                        $matches = ($requestInstance->getRequestElement('pass_hash') === $this->getResultInstance()->getFoundValue());
                } // END - if
 
                        $matches = ($requestInstance->getRequestElement('pass_hash') === $this->getResultInstance()->getFoundValue());
                } // END - if