Merge pull request #60 from mlocati-forks/fix-deleted-attributekey

aembler · web-flow · commit a8b071b262d5 · 2025-10-06T11:40:26.000-07:00
Fix viewing export batch when an attribute key is deleted
diff --git a/src/PortlandLabs/Concrete5/MigrationTool/Exporter/Item/Type/AttributeKey.php b/src/PortlandLabs/Concrete5/MigrationTool/Exporter/Item/Type/AttributeKey.php
@@ -31,7 +31,7 @@ public function getResultColumns(ExportItem $exportItem)
     {
         $ak = Key::getInstanceByID($exportItem->getItemIdentifier());
 
-        return array($ak->getAttributeKeyDisplayName());
+        return array($ak ? $ak->getAttributeKeyDisplayName() : h('<' . t('Deleted Attribute Key') . '>'));
     }
 
     public function getItemsFromRequest($array)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function getResultColumns(ExportItem $exportItem)`
`31`	`31`	`{`
`32`	`32`	`$ak = Key::getInstanceByID($exportItem->getItemIdentifier());`
`33`	`33`
`34`		`- return array($ak->getAttributeKeyDisplayName());`
	`34`	`+ return array($ak ? $ak->getAttributeKeyDisplayName() : h('<' . t('Deleted Attribute Key') . '>'));`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function getItemsFromRequest($array)`