Skip to content

Commit

Permalink
fixes for various undefined index errors:
Browse files Browse the repository at this point in the history
 - the "like" button alternate text can't show show users if no one had liked the message before
- the "like" button shouldn't appear if the "like" feature is disabled.
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
  • Loading branch information
eurich committed Jul 5, 2013
1 parent 9612c8a commit fe52ebd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
1 change: 1 addition & 0 deletions sources/controllers/Display.controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -1043,6 +1043,7 @@ public function prepareDisplayContext_callback($reset = false)
'can_like' => $message['use_likes'] && !$message['likes'],
'can_unlike' => $message['use_likes'] && $message['likes'],
'like_counter' =>$message['like_count'],
'likes_enabled' => !empty($modSettings['likes_enabled']) ? true : false,
);

// Is this user the message author?
Expand Down
19 changes: 8 additions & 11 deletions themes/default/Display.template.php
Original file line number Diff line number Diff line change
Expand Up @@ -213,31 +213,28 @@ function template_main()
</ul>';
}

// Has anyone liked this post? @todo - Still needs a bit of tweaking.
//if (!empty($message['like_counter']))
// Hide likes for those who can't like or unlike for now..
if ($message['likes_enabled'])
{
echo '
<li class="listlevel1"><a href="#" title="', $txt['liked_by'], ' ', implode(', ', $context['likes'][$message['id']]['member']), '" class="linklevel1 likes_button">', !empty($message['like_counter']) ? '&nbsp;'. $message['like_counter']. '&nbsp;'. $txt['likes'] :'&nbsp;', '</a>';
<li class="listlevel1"><a href="#" title="', !empty($message['like_counter']) ? $txt['liked_by'] . ' ' . implode(', ', $context['likes'][$message['id']]['member']) : '', '" class="linklevel1 likes_button">', !empty($message['like_counter']) ? '&nbsp;'. $message['like_counter']. '&nbsp;'. $txt['likes'] :'&nbsp;', '</a>';

// Can they like this post
// Can they like this post?
if ($message['can_like'])
{
echo '
echo '
<ul class="menulevel2">
<li class="listlevel2"><a href="', $scripturl, '?action=likes;sa=likepost;topic=', $context['current_topic'], 'msg=' . $message['id'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" class="linklevel2 like_button">', $txt['like_post'], '</a></li>
</ul>';
}
// Or remove the like they made
elseif ($message['can_unlike'])
{
echo '
echo '
<ul class="menulevel2">
<li class="listlevel2"><a href="', $scripturl, '?action=likes;sa=unlikepost;topic=', $context['current_topic'], 'msg=' . $message['id'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" class="linklevel2 unlike_button">', $txt['unlike_post'], '</a></li>
</ul>';
}

echo '
</li>';

}
// Can the user quick modify the contents of this post? Show the quick (inline) modify button.
if ($message['can_modify'])
echo '
Expand Down

0 comments on commit fe52ebd

Please sign in to comment.