merged conflicting stuff. Added 'me' tag

[zzz-floof.git] / floof / templates / users / view.mako

diff --git a/floof/templates/users/view.mako b/floof/templates/users/view.mako
index 5c2e8e6..3bff21a 100644 (file)
--- a/floof/templates/users/view.mako
+++ b/floof/templates/users/view.mako
@@ -21,8 +21,8 @@ ${h.form(url(controller='user_settings', action='rel_toggle', name=c.user.name.l
     % endif
 % endif
 
     % endif
 % endif
 

-<%! from floof.lib.search import parse %>
+<%! from floof.lib.tags import parse %>

 % for gallery in c.this_user.primary_page.galleries:
 <h2>${gallery.string}</h2>
 % for gallery in c.this_user.primary_page.galleries:
 <h2>${gallery.string}</h2>

-${macros.thumbs(parse(gallery.string))}
+${macros.thumbs(parse(gallery.search.string))}

 % endfor
 % endfor