Merge commit 'Memories as 1.3'

[memories.git] / Memories / User.pm

diff --git a/Memories/User.pm b/Memories/User.pm
index 2fa82ca3cb5179e15a847a47ada02e33d4f8e1c4..b0020a53fd4dd211cbc063ab40c4717836c3c6b4 100644 (file)
--- a/Memories/User.pm
+++ b/Memories/User.pm
@@ -30,6 +30,7 @@ sub view :Exported {
     $user->id,{order_by => "uploaded desc"}) ];
     $r->{template_args}{pager} = $pager;
     $r->{template_args}{albums} = [$user->albums(privacy => 0)];
+    $r->last_search;
 }
 
 # Album support!
@@ -64,4 +65,13 @@ sub edit_albums :Exported {
     
 }
 
+sub api_taglist :Exported {
+    my ($self, $r) = @_;
+    my $user = $r->objects->[0];
+    $r->{output} .= $_->{tag}.":".$_->{count}."\n"
+        for Memories::Tagging->search_user_summary($user->id);
+    $r->{output}.= "\n";
+    $r->{content_type} = "text/plain";
+}
+
 1;