Check for null tertiary key

Author: alexweissman

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## v4.1.14-alpha
+- Fix issue with scopes being applied twice in Unique::getPaginatedQuery (https://github.com/userfrosting/extend-user/issues/2)
+
 ## v4.1.13-alpha
 - `ufTable`: Implement `rowTemplate` for customizing how rows are rendered (#787)
 - `ufTable`: Support for passing callbacks for column templates instead of Handlebars templates

app/sprinkles/core/src/Database/Relations/Concerns/Unique.php

@@ -437,13 +437,15 @@ protected function buildDictionary(Collection $results, $parentKey = null)
             if (!is_null($tertiaryModels)) {
                 $tertiaryKeyValue = $result->pivot->{$this->tertiaryKey};
 
-                $tertiaryModel = clone $tertiaryModels[$tertiaryKeyValue];
-
-                // We also transfer the pivot relation at this point, since we have already coalesced
-                // any tertiary models into the nested dictionary.
-                $this->transferPivotsToTertiary($result, $tertiaryModel);
-
-                $nestedTertiaryDictionary[$parentKeyValue][$result->getKey()][] = $tertiaryModel;
+                if (!is_null($tertiaryKeyValue)) {
+                    $tertiaryModel = clone $tertiaryModels[$tertiaryKeyValue];
+    
+                    // We also transfer the pivot relation at this point, since we have already coalesced
+                    // any tertiary models into the nested dictionary.
+                    $this->transferPivotsToTertiary($result, $tertiaryModel);
+    
+                    $nestedTertiaryDictionary[$parentKeyValue][$result->getKey()][] = $tertiaryModel;
+                }
             }
         }