do not base headlines label context submenu on feed tree labels category

1 files changed, 3 insertions, 6 deletions

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 3e2f97751..6a1e15c33 100755
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1738,7 +1738,7 @@ function headlinesMenuCommon(menu) {
 	}));
 
 
-	var labels = dijit.byId("feedTree").model.getItemsInCategory(-2);
+	var labels = getInitParam("labels");
 
 	if (labels) {
 
@@ -1748,11 +1748,8 @@ function headlinesMenuCommon(menu) {
 		var labelDelMenu = new dijit.Menu({ownerMenu: menu});
 
 		labels.each(function (label) {
-			var id = label.id[0];
-			var bare_id = id.substr(id.indexOf(":") + 1);
-			var name = label.name[0];
-
-			bare_id = feed_to_label_id(bare_id);
+			var bare_id = label.id;
+			var name = label.caption;
 
 			labelAddMenu.addChild(new dijit.MenuItem({
 				label: name,