X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2Ftemplates%2Ffactory%2Fmacros;h=d2192bdad1557b2e11d8bb1e94e756a761275626;hb=e767951f92d57740dc76425868cce32f6bcf1296;hp=c96cb17db8d7818e23b0a04efbbf5273083bd8ce;hpb=c3973978e1373a262d13da63c9e9ecfde4b72cc7;p=maypole.git

diff --git a/lib/Maypole/templates/factory/macros b/lib/Maypole/templates/factory/macros
index c96cb17..d2192bd 100644
--- a/lib/Maypole/templates/factory/macros
+++ b/lib/Maypole/templates/factory/macros
@@ -14,7 +14,7 @@ catenating the base URL, table, command, and any arguments.
 [%
 MACRO link(table, command, additional, label) BLOCK;
     SET lnk = base _ "/" _ table _ "/" _ command _ "/" _ additional;
-    lnk = lnk | uri | html;
+    lnk = lnk | uri ;
     '<a href="' _ lnk _ '">';
     label | html;
     "</a>";
@@ -63,8 +63,7 @@ for some.
         ELSIF col == classmetadata.stringify_column;
             maybe_link_view(item);
  		ELSIF col_obj; # its a real column
-            accessor = item.accessor_name_for(col_obj) ||
-			           item.accessor_name(col_obj); # deprecated in cdbi
+            accessor = item.accessor_name_for(col_obj) || item.accessor_name(col_obj); # deprecated in cdbi
             maybe_link_view(item.$accessor);
         ELSE; 
             item.$col;