aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-01-19 15:15:34 -0800
committerredmatrix <git@macgirvin.com>2016-01-19 15:15:34 -0800
commit24bffd4418ff4996d8a7a57d87b1a18f93da9fad (patch)
treec2199b772a3ba176fbdabc917ebb4f8c22582377
parent1e523414f8a7949f4f685a8cd960c2352ac94e0d (diff)
downloadvolse-hubzilla-24bffd4418ff4996d8a7a57d87b1a18f93da9fad.tar.gz
volse-hubzilla-24bffd4418ff4996d8a7a57d87b1a18f93da9fad.tar.bz2
volse-hubzilla-24bffd4418ff4996d8a7a57d87b1a18f93da9fad.zip
Separate item_photo_menu() into links which deal with the post and those which deal with the author. We should probably also make this info available to themes so they could for instance provide a visual separator.
-rw-r--r--include/conversation.php17
-rw-r--r--version.inc2
2 files changed, 12 insertions, 7 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 747bb5d0a..7070ac221 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -942,25 +942,30 @@ function item_photo_menu($item){
$clean_url = normalise_link($item['author-link']);
}
- $menu = Array(
+ $ratings_url = z_root() . '/ratings/' . urlencode($item['author_xchan']);
+
+ $post_menu = Array(
t("View Source") => $vsrc_link,
t("Follow Thread") => $sub_link,
t("Unfollow Thread") => $unsub_link,
- t("View Status") => $status_link,
+ );
+
+ $author_menu = array(
t("View Profile") => $profile_link,
- t("View Photos") => $photos_link,
t("Activity/Posts") => $posts_link,
t("Connect") => $follow_url,
t("Edit Connection") => $contact_url,
- t("Send PM") => $pm_url,
+ t("Message") => $pm_url,
+ t('Ratings') => $ratings_url,
t("Poke") => $poke_link
);
- $args = array('item' => $item, 'menu' => $menu);
+
+ $args = array('item' => $item, 'post_menu' => $post_menu, 'author_menu' => $author_menu);
call_hooks('item_photo_menu', $args);
- $menu = $args['menu'];
+ $menu = array_merge($args['post_menu'],$args['author_menu']);
$o = "";
foreach($menu as $k=>$v){
diff --git a/version.inc b/version.inc
index 10776afeb..fb02d7c69 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-18.1282H
+2016-01-19.1283H