Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup

Conflicts:
	mod/dfrn_poll.php

5 files changed, 17 insertions, 4 deletions

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 4b25efe41..77beabf90 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -445,7 +445,7 @@ function dfrn_poll_content(&$a) {
 					'sec' => $sec
 				));
 			}
-
+			
 			$profile = $r[0]['nickname'];
 
 			switch($destination_url) {
@@ -489,6 +489,10 @@ function dfrn_poll_content(&$a) {
 						dbesc($session_id)
 					); 
 				}
+<<<<<<< HEAD
+=======
+				
+>>>>>>> 890753e5b545ca5777c6c9084e99cacf42a3b485
 			
 				goaway($dest);
 			}
diff --git a/mod/message.php b/mod/message.php
index 7978ecaf2..7f17a362b 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -172,7 +172,9 @@ function message_content(&$a) {
 			'$linkurl' => t('Please enter a link URL:')
 		));
 	
-		$select = contact_select('messageto','message-to-select', false, 4, true);
+		$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
+	
+		$select = contact_select('messageto','message-to-select', $preselect, 4, true);
 		$tpl = load_view_file('view/prv_message.tpl');
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Send Private Message'),
diff --git a/mod/network.php b/mod/network.php
index a304c211f..42c6c0c29 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -217,6 +217,7 @@ function network_content(&$a, $update = 0) {
 			intval($a->pager['start']),
 			intval($a->pager['itemspage'])
 		);
+		
 	}
 	else {
 
@@ -323,11 +324,12 @@ function network_content(&$a, $update = 0) {
 
 				$drop = replace_macros($droptpl,array('$id' => $item['id']));
 				$lock = '<div class="wall-item-lock"></div>';
-
+				
 				$o .= replace_macros($tpl,array(
 					'$id' => $item['item_id'],
 					'$linktitle' => t('View $name\'s profile'),
 					'$profile_url' => $profile_link,
+					'$item_photo_menu' => item_photo_menu($item),
 					'$name' => $profile_name,
 					'$sparkle' => $sparkle,
 					'$lock' => $lock,
@@ -551,6 +553,7 @@ function network_content(&$a, $update = 0) {
 				$indent .= ' shiny'; 
 
 
+
 			// Build the HTML
 
 			$tmp_item = replace_macros($template,array(
@@ -561,6 +564,7 @@ function network_content(&$a, $update = 0) {
 				'$wall' => t('Wall-to-Wall'),
 				'$vwall' => t('via Wall-To-Wall:'),
 				'$profile_url' => $profile_link,
+				'$item_photo_menu' => item_photo_menu($item),
 				'$name' => $profile_name,
 				'$thumb' => $profile_avatar,
 				'$osparkle' => $osparkle,
@@ -604,4 +608,4 @@ function network_content(&$a, $update = 0) {
 	}
 
 	return $o;
-}
\ No newline at end of file
+}
diff --git a/mod/profile.php b/mod/profile.php
index 17f6a2d45..ab1e8f738 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -454,10 +454,12 @@ function profile_content(&$a, $update = 0) {
 			if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
 				$indent .= ' shiny'; 
 
+
 			$tmp_item = replace_macros($template,array(
 				'$id' => $item['item_id'],
 				'$linktitle' => t('View $name\'s profile'),
 				'$profile_url' => $profile_link,
+				'$item_photo_menu' => item_photo_menu($item),				
 				'$name' => $profile_name,
 				'$thumb' => $profile_avatar,
 				'$sparkle' => $sparkle,
diff --git a/mod/search.php b/mod/search.php
index db7279fb5..64281dfcf 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -115,6 +115,7 @@ function search_content(&$a) {
 				'$id' => $item['item_id'],
 				'$linktitle' => t('View $name\'s profile'),
 				'$profile_url' => $profile_link,
+				'$item_photo_menu' => item_photo_menu($item),				
 				'$name' => $profile_name,
 				'$sparkle' => $sparkle,
 				'$lock' => $lock,