Merge branch '2.0'

Conflicts:
	com.woltlab.wcf/templates/membersList.tpl

diff --cc com.woltlab.wcf/templates/membersList.tpl
index 8b538358e7adfba28f6a2ed766635326e74617e9,9b320517798bce90cc11d68d6396066ccd7f8098..4eeb957380f35b60ac8f903ea55ac764ab64445f
--- 1/com.woltlab.wcf/templates/membersList.tpl
--- 2/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@@ -79,8 -79,7 +79,8 @@@
                                                        <option value="username"{if $sortField == 'username'} selected="selected"{/if}>{lang}wcf.user.username{/lang}</option>
                                                        <option value="registrationDate"{if $sortField == 'registrationDate'} selected="selected"{/if}>{lang}wcf.user.registrationDate{/lang}</option>
                                                        <option value="activityPoints"{if $sortField == 'activityPoints'} selected="selected"{/if}>{lang}wcf.user.activityPoint{/lang}</option>
-                                                       <option value="likesReceived"{if $sortField == 'likesReceived'} selected="selected"{/if}>{lang}wcf.like.likesReceived{/lang}</option>
+                                                       {if MODULE_LIKE}<option value="likesReceived"{if $sortField == 'likesReceived'} selected="selected"{/if}>{lang}wcf.like.likesReceived{/lang}</option>{/if}
 +                                                      <option value="lastActivityTime"{if $sortField == 'lastActivityTime'} selected="selected"{/if}>{lang}wcf.user.usersOnline.lastActivity{/lang}</option>
                                                        {event name='sortField'}
                                                </select>
                                                <select name="sortOrder">