# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1555365000 -7200
# Node ID 0eb11fcba6d08c31ad8be120b2f443de704d0213
# Parent  e1da4a0e95ada9750274727e5948851a753a63d1
Attempted to fix interwiki links without page identifiers.

diff -r e1da4a0e95ad -r 0eb11fcba6d0 moinformat/links/html.py
--- a/moinformat/links/html.py	Mon Apr 15 23:42:51 2019 +0200
+++ b/moinformat/links/html.py	Mon Apr 15 23:50:00 2019 +0200
@@ -135,13 +135,15 @@
         # Attachment links.
 
         if type == "attachment":
-            return Link(self.translate_attachment(identifier), identifier, target)
+            return Link(self.translate_attachment(identifier),
+                        identifier, target)
 
         # Interwiki links.
 
         url = self.mapping.get(type)
         if url:
-            return Link(self.translate_interwiki(url, identifier), identifier, target)
+            return Link(self.translate_interwiki(url, identifier),
+                        identifier or type, target)
 
         return None
 
diff -r e1da4a0e95ad -r 0eb11fcba6d0 moinformat/utils/links.py
--- a/moinformat/utils/links.py	Mon Apr 15 23:42:51 2019 +0200
+++ b/moinformat/utils/links.py	Mon Apr 15 23:50:00 2019 +0200
@@ -42,7 +42,10 @@
     __unicode__ = __str__
 
     def get_identifier(self):
-        return self.identifier or self.text
+        if self.identifier is not None:
+            return self.identifier
+        else:
+            return self.text
 
     def get_text(self):
         return self.text
@@ -113,12 +116,9 @@
 
     mapping = metadata and metadata.get("mapping")
 
-    if prefix == "attachment":
+    if prefix == "attachment" or mapping and mapping.get(prefix):
         return LinkTarget(prefix, target, identifier)
 
-    if mapping and mapping.get(prefix):
-        return LinkTarget(prefix, target, identifier or prefix)
-
     return None
 
 # vim: tabstop=4 expandtab shiftwidth=4