From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 6 Aug 2014 11:55:54 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~474
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9644a35a9a23fbb636b03982237423804386b236;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

9644a35a9a23fbb636b03982237423804386b236
diff --cc com.woltlab.wcf/templates/membersList.tpl
index 8b538358e7,9b32051779..4eeb957380
--- a/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">