--- MoinMoin/theme/__init__.py.orig	2006-01-01 16:37:12.000000000 -0500
+++ MoinMoin/theme/__init__.py	2006-01-15 03:35:14.000000000 -0500
@@ -275,9 +275,12 @@
             else:
                 page = Page(request, text)
             pagename = page.page_name
-            title = page.split_title(request)
-            title = self.shortenPagename(title)
-            link = page.link_to(request, title)
+            fulltitle = page.split_title(request)
+            title = self.shortenPagename(fulltitle)
+            if title != fulltitle:
+                link = page.link_to(request, title, title=fulltitle)
+            else:
+                link = page.link_to(request, title)
 
 
         from MoinMoin import config
@@ -384,9 +387,12 @@
 
         # Add current page at end
         if not current in found:
-            title = d['page'].split_title(request)
-            title = self.shortenPagename(title)
-            link = d['page'].link_to(request, title)
+            fulltitle = d['page'].split_title(request)
+            title = self.shortenPagename(fulltitle)
+            if title != fulltitle:
+                link = d['page'].link_to(request, title, title=fulltitle)
+            else:
+                link = d['page'].link_to(request, title)
             cls = 'current'
             items.append(item % (cls, link))
 
@@ -521,9 +527,13 @@
                         # links, using _ for spaces.
                         page = page.replace('_', ' ')
                         if request.cfg.interwikiname != interwiki:
-                            link = (self.request.formatter.interwikilink(
-                                True, interwiki, page) +
-                                    self.shortenPagename(page) +
+                            shortenedpage = self.shortenPagename(page)
+                            if shortenedpage != page:
+                                link = self.request.formatter.interwikilink(True, interwiki, page, title=page)
+                            else:
+                                link = self.request.formatter.interwikilink(True, interwiki, page)
+
+                            link = link + shortenedpage +
                                     self.request.formatter.interwikilink(False))
                             items.append('<li>%s</li>' % link)
                             continue
@@ -533,9 +543,12 @@
                     except ValueError:
                         pass
                     page = Page(request, pagename)
-                    title = page.split_title(request)
-                    title = self.shortenPagename(title)
-                    link = page.link_to(request, title)
+                    fulltitle = page.split_title(request)
+                    title = self.shortenPagename(fulltitle)
+                    if title != fulltitle:
+                        link = page.link_to(request, title, title=fulltitle)
+                    else:
+                        link = page.link_to(request, title)
                     items.append('<li>%s</li>' % link)
                 html = '''
 <ul id="pagetrail">