[livejournal] r17913: LJSUP-7377: Wishlist

U   trunk/htdocs/tools/endpoints/ctxpopup.bml

Modified: trunk/htdocs/tools/endpoints/ctxpopup.bml
===================================================================
--- trunk/htdocs/tools/endpoints/ctxpopup.bml	2010-12-13 08:53:35 UTC (rev 17912)
+++ trunk/htdocs/tools/endpoints/ctxpopup.bml	2010-12-13 08:55:12 UTC (rev 17913)
@@ -134,7 +134,6 @@
         report send_gift buy_same_userhead send_message stop_community subscribe_feed
         this_is_you unban unsubscribe_feed updating view watch_community
         your_friend you_member you_subscribed you_watching
-        view_wishlist
     /;
     ## optimization: load all ML strings into local cache at once
     LJ::Lang::get_text_multi(BML::get_language(), undef, [map { "$language_scope.$_" } @ml_keys]);
@@ -171,12 +170,11 @@
         }
     }
 
-    $ret{wishlist_url} = $u->journal_base . "/wishlist"
-        if LJ::WishList->may_edit($u);
-
     sleep(1.5) if $LJ::IS_DEV_SERVER;
-    my %extrainfo = LJ::run_hook("ctxpopup_extra_info", $u);
-    %ret = (%ret, %extrainfo);
+    my @hooked = LJ::run_hooks("ctxpopup_extra_info", $u);
+    foreach my $result (@hooked) {
+        %ret = (%ret, @$result);
+    }
 
     if ($remote && $u) {
         $ret{is_banned} = LJ::is_banned($u,$remote) ? 1 : 0;