Fixed #3899

craftcms · Feb 25, 2019 · 5034ee0 · 5034ee0
1 parent 00aa87e
commit 5034ee0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -14,6 +14,7 @@
 - Fixed a bug where structures weren’t getting deleted and unassigned from their sections properly after converting a Structure section to a Channel or Single. ([#3895](https://github.com/craftcms/cms/issues/3895))
 - Really fixed a bug where Craft could update the `dateModified` value in the project config even when nothing had changed. ([#3792](https://github.com/craftcms/cms/issues/3792))
 - Fixed a bug where the Settings → Routes page wasn’t listing routes in the user-defined order. ([#3892](https://github.com/craftcms/cms/issues/3892))
+- Fixed an error that occurred when viewing trashed entries, if the “Entry Type” column was shown and one of the trashed entries’ entry types had been deleted. ([#3899](https://github.com/craftcms/cms/issues/3899))
 
 ## 3.1.14 - 2019-02-21
 

diff --git a/src/elements/Entry.php b/src/elements/Entry.php
@@ -902,14 +902,17 @@ protected function tableAttributeHtml(string $attribute): string
         switch ($attribute) {
             case 'author':
                 $author = $this->getAuthor();
-
                 return $author ? Craft::$app->getView()->renderTemplate('_elements/element', ['element' => $author]) : '';
 
             case 'section':
                 return Craft::t('site', $this->getSection()->name);
 
             case 'type':
-                return Craft::t('site', $this->getType()->name);
+                try {
+                    return Craft::t('site', $this->getType()->name);
+                } catch (InvalidConfigException $e) {
+                    return Craft::t('app', 'Unknown');
+                }
         }
 
         return parent::tableAttributeHtml($attribute);