From b347908af7182368694a778505f40bd892ec4616 Mon Sep 17 00:00:00 2001
From: David Logie <djl@mksh.org>
Date: Thu, 27 Sep 2018 14:54:23 +0100
Subject: [PATCH] Address PR comments.

---
 beets/library.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/beets/library.py b/beets/library.py
index c911bbaa5..bbb6452fe 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -1395,8 +1395,6 @@ class Library(dbcore.Database):
         """
         if isinstance(item_or_id, int):
             album_id = item_or_id
-        elif isinstance(item_or_id, Album):
-            album_id = item_or_id.id
         else:
             album_id = item_or_id.album_id
         if album_id is None:
@@ -1537,7 +1535,7 @@ class DefaultTemplateFunctions(object):
             bracket_l = u''
             bracket_r = u''
 
-        album = self.lib.get_album(self.item)
+        album = self.lib.get_album(album_id)
         if not album:
             # Do nothing for singletons.
             self.lib._memotable[memokey] = u''