Merge remote branch 'upstream/master'

1 files changed, 15 insertions, 2 deletions

diff --git a/mod/like.php b/mod/like.php
index 916faf230..f4fd33787 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -209,13 +209,17 @@ function like_content(&$a) {
 	}
 	else {
 
+		// this is used to like an item or comment
+
 		$item_id = ((argc() == 2) ? notags(trim(argv(1))) : 0);
 
 		logger('like: verb ' . $verb . ' item ' . $item_id, LOGGER_DEBUG);
 
+		// get the item. Allow linked photos (which are normally hidden) to be liked
 
-		$r = q("SELECT * FROM item WHERE id = %d and item_restrict = 0 LIMIT 1",
-			dbesc($item_id)
+		$r = q("SELECT * FROM item WHERE id = %d and (item_restrict = 0 or item_restrict = %d) LIMIT 1",
+			intval($item_id),
+			intval(ITEM_HIDDEN)
 		);
 
 		if(! $item_id || (! $r)) {
@@ -325,6 +329,15 @@ function like_content(&$a) {
 		if($item['item_flags'] & ITEM_WALL)
 			$item_flags |= ITEM_WALL;
 
+		// if this was a linked photo and was hidden, unhide it.
+
+		if($item['item_restrict'] & ITEM_HIDDEN) {
+			$r = q("update item set item_restrict = (item_restrict ^ %d) where id = %d limit 1",
+				intval(ITEM_HIDDEN),
+				intval($item['id'])
+			);
+		}	
+
 	}
 
 	if($verb === 'like')