Fixes.

mydnshost · Sep 11, 2020 · f536ef1 · f536ef1
1 parent 4dbe9e8
commit f536ef1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/classes/domain.php b/classes/domain.php
@@ -564,8 +564,9 @@ public function getRecordsInfo($expandRecordsInfo = false, $raw = false) {
 					}
 					[$sourceDom, $sourceRecords] = $rrCloneCache[$wantedRecord];
 					// Remember this so that we can trigger updates in future.
-					if ($record->getRemoteDomainID() != $sourceDom->getID()) {
-						$record->setRemoteDomainID($sourceDom->getID())->save();
+					$sourceID = ($sourceDom instanceof Domain) ? $sourceDom->getID() : null;
+					if ($record->getRemoteDomainID() != $sourceID) {
+						$record->setRemoteDomainID($sourceID)->save();
 					}
 				}
 

diff --git a/web/1.0/methods/domains.php b/web/1.0/methods/domains.php
@@ -669,8 +669,10 @@ protected function getDomainList() {
 			if ($wantedType == 'userdata' && isset($_REQUEST['key'])) {
 				$useValData = true;
 				$udcd = UserDomainCustomData::loadFromUserDomainKey($this->getContextKey('db'), $this->getContextKey('user')->getID(), null, $_REQUEST['key']);
-				foreach ($udcd as $d) {
-					$valData[$d->getDomainID()] = $d->getValue();
+				if (is_array($udcd)) {
+					foreach ($udcd as $d) {
+						$valData[$d->getDomainID()] = $d->getValue();
+					}
 				}
 			}