Only uses autoload to require validation classes.

[platal.git] / classes / profile.php

diff --git a/classes/profile.php b/classes/profile.php
index d6763a4..d3a1fdd 100644 (file)
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -423,10 +423,12 @@ class Profile
         $this->fetched_fields = $fields;
     }
 
+    /** Have we already fetched this field ?
+     */
     private function fetched($field)
     {
-        if (($fields | self::FETCH_ALL) != self::FETCH_ALL) {
-            Platal::page()->kill("Invalid fetched fields: $fields");
+        if (!array_key_exists($field, ProfileField::$fields)) {
+            Platal::page()->kill("Invalid field: $field");
         }
 
         return ($this->fetched_fields & $field);
@@ -456,6 +458,7 @@ class Profile
      */
     private function consolidateFields()
     {
+        // Link phones to addresses
         if ($this->phones != null) {
             if ($this->addresses != null) {
                 $this->addresses->addPhones($this->phones);
@@ -466,9 +469,12 @@ class Profile
             }
         }
 
+        // Link addresses to jobs
         if ($this->addresses != null && $this->jobs != null) {
             $this->jobs->addAddresses($this->addresses);
         }
+
+        // Link jobterms to jobs
         if ($this->jobs != null && $this->jobterms != null) {
             $this->jobs->addJobTerms($this->jobterms);
         }