Refs #2895 reverting [8532] as code is not working as intended. Can comment and like everything because menu items are being registered. Perhaps questionable benefit of using the menu system here.

git-svn-id: http://code.elgg.org/elgg/trunk@8566 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 12 insertions, 13 deletions

diff --git a/views/default/river/item/controls.php b/views/default/river/item/controls.php
index 50c1ae09e..468983329 100644
--- a/views/default/river/item/controls.php
+++ b/views/default/river/item/controls.php
@@ -13,39 +13,38 @@ if (elgg_is_logged_in()) {
 	if ($vars['item']->annotation_id == 0) {
 		// comments
 		if ($object->canComment()) {
-			elgg_register_menu_item('river', array(
-				'name' => 'comment',
+			$params = array(
 				'href' => "#comments-add-$object->guid",
 				'text' => elgg_echo('generic_comments:text'),
 				'class' => "elgg-toggler",
-			));
+			);
+			echo elgg_view('output/url', $params);
 		}
 
 		// like this
 		if ($object->canAnnotate(0, 'likes')) {
 			if (!elgg_annotation_exists($object->getGUID(), 'likes')) {
-				
-				elgg_register_menu_item('river', array(
-					'name' => 'likes',
-					'href' => "action/likes/add?guid={$object->getGUID()}",
+				$url = "action/likes/add?guid={$object->getGUID()}";
+				$params = array(
+					'href' => $url,
 					'text' => elgg_echo('likes:likethis'),
 					'is_action' => true,
-				));
+				);
 			} else {
 				$likes = elgg_get_annotations(array(
 					'guid' => $guid,
 					'annotation_name' => 'likes',
 					'owner_guid' => elgg_get_logged_in_user_guid()
 				));
-
-				elgg_register_menu_item('river', array(
-					'href' => "action/likes/delete?annotation_id={$likes[0]->id}",
+				$url = elgg_get_site_url() . "action/likes/delete?annotation_id={$likes[0]->id}";
+				$params = array(
+					'href' => $url,
 					'text' => elgg_echo('likes:remove'),
 					'is_action' => true,
-				));
+				);
 			}
+			echo elgg_view('output/url', $params);
 		}
 	}
 
-	echo elgg_view_menu('river', array('sort_by' => 'priority', 'item' => $vars['item']));
 }
\ No newline at end of file