merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -6,6 +6,7 @@ Fixed:
 - reset ID counters if the database is cleared (thanks William)
 - apply IE caching "fix" to automatically serve up all pages expired
 - fix typo (sf patch 1076629)
+- fix hyperlinking of items (sf bug 1080251)
 
 
 2004-10-26 0.7.9

roundup/cgi/templating.py

@@ -1080,9 +1080,9 @@ def _hyper_repl(self, match):
                 cl = self._db.getclass(s1.lower())
                 if not cl.hasnode(s2):
                     raise KeyError, 'oops'
-                return '<a href="%s">%s%s</a>'%(s, s1, s2)
+                return '<a href="%s%s">%s</a>'%(s1, s2, s)
             except KeyError:
-                return '%s%s'%(s1, s2)
+                return s
 
     def hyperlinked(self):
         ''' Render a "hyperlinked" version of the text '''