Moved popup logic in boot.php, added 'item_photo_menu' hook
This commit is contained in:
		| @@ -209,6 +209,7 @@ function network_content(&$a, $update = 0) { | ||||
| 			intval($a->pager['start']), | ||||
| 			intval($a->pager['itemspage']) | ||||
| 		); | ||||
| 		 | ||||
| 	} | ||||
| 	else { | ||||
|  | ||||
| @@ -315,11 +316,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, | ||||
| @@ -543,7 +545,6 @@ function network_content(&$a, $update = 0) { | ||||
| 				$indent .= ' shiny';  | ||||
|  | ||||
|  | ||||
| 			$contact_url = $a->get_baseurl()."/contacts/".$item['cid']; | ||||
|  | ||||
| 			// Build the HTML | ||||
|  | ||||
| @@ -555,9 +556,7 @@ function network_content(&$a, $update = 0) { | ||||
| 				'$wall' => t('Wall-to-Wall'), | ||||
| 				'$vwall' => t('via Wall-To-Wall:'), | ||||
| 				'$profile_url' => $profile_link, | ||||
| 				'$profile_tab_url' => $profile_link."?tab=profile", //don't work with secure redirects | ||||
| 				'$contact_url' => $contact_url, | ||||
| 				'$pm_url' => "", | ||||
| 				'$item_photo_menu' => item_photo_menu($item), | ||||
| 				'$name' => $profile_name, | ||||
| 				'$thumb' => $profile_avatar, | ||||
| 				'$osparkle' => $osparkle, | ||||
|   | ||||
| @@ -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, | ||||
|   | ||||
| @@ -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, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user