Merge pull request #2513 from bleistivt/patch-8

UserMetaModel: respect default parameter
vanilla · Feb 21, 2015 · 898da78 · 898da78
2 parents 2ea05fc + 3bdfdef
commit 898da78
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/applications/dashboard/models/class.usermetamodel.php b/applications/dashboard/models/class.usermetamodel.php
@@ -106,16 +106,18 @@ public function GetUserMeta($UserID, $Key = NULL, $Default = NULL) {
       $UserMetaData = $UserMetaQuery->Get();
 
       $UserMeta = array();
-      if ($UserMetaData->NumRows())
+      if ($UserMetaData->NumRows()) {
          if (is_array($UserID)) {
             while ($MetaRow = $UserMetaData->NextRow())
                $UserMeta[$MetaRow->UserID][$MetaRow->Name] = $MetaRow->Value;
          } else {
             while ($MetaRow = $UserMetaData->NextRow())
                $UserMeta[$MetaRow->Name] = $MetaRow->Value;
          }
-      else
+      } else {
          self::$MemoryCache[$Key] = $Default;
+         $UserMeta[$Key] = $Default;
+      }
 
       unset($UserMetaData);
       return $UserMeta;
@@ -227,4 +229,4 @@ public function SetUserMeta($UserID, $Key, $Value = NULL) {
       return;
    }
 
-}
+}