diff --cc wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php index abcd54378f,0283e3910c..99953b4a1a --- a/wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php +++ b/wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php @@@ -226,10 -226,9 +226,9 @@@ class MySQLDatabaseEditor extends Datab * * @param string $indexName * @param array $indexData - * @param string + * @return string */ protected function buildIndexDefinition($indexName, $indexData) { - $definition = ""; // index type if ($indexData['type'] == 'PRIMARY') $definition = "PRIMARY KEY"; else if ($indexData['type'] == 'UNIQUE') $definition = "UNIQUE KEY"; diff --cc wcfsetup/install/lang/en.xml index de37302ca8,d9906097d4..08208993be --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@@ -342,7 -348,8 +342,7 @@@ Examples for medium ID detection - + - @@@ -670,8 -676,8 +671,9 @@@ + {literal}{$username}{/literal} will be replaced by the name and {literal}{$email}{/literal} by the mail address of the active user.]]> + @@@ -762,32 -759,35 +764,32 @@@ - - - - - - - + - + - + - + - + + + + + + - - - + @@@ -943,25 -949,30 +946,25 @@@ - + - + - + - + - - - + - - - - - + - - + + + @@@ -1007,9 -1018,11 +1010,9 @@@ GmbH=Gesellschaft mit beschrÃ¤nkter Haf - + - + - - @@@ -1039,9 -1052,7 +1042,9 @@@ - + + + getPath()}acp/dereferrer.php?url=https://de.gravatar.com/site/implement/images/#default-image">default Gravatar type used if no matching Gravatar was found.]]> @@@ -1059,17 -1070,9 +1062,17 @@@ management for paid subscriptions.]]> - + + + + + + + + + @@@ -1567,9 -1581,14 +1570,9 @@@ - + - - - - - @@@ -1584,9 -1603,11 +1587,9 @@@ - - + - + - -{if MAIL_USE_FORMATTED_ADDRESS}Sender Name <email@example.com>
{/if} + You can define the default sender in System -> Options -> General -> Emails. The senderâs email must be known to the server if using SMTP, otherwise it would be rejected.]]> @@@ -1615,11 -1636,10 +1618,11 @@@ + - - + + @@@ -2219,10 -2231,9 +2222,10 @@@ Errors are - + + @@@ -2401,31 -2371,7 +2404,31 @@@ - + + userID}a guest{else}{@$author->username}{/if} wrote a comment on the moderation entry "{$moderationQueue->getTitle()}": +{if $notificationType == 'instant'} +--------------------------------- +{@$comment->message} +--------------------------------- +{/if}{$moderationQueue->getLink()}#comments]]> + username}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->username}{if $count == 3} and {@$authors[2]->username}{/if}{/if}{else}{@$authors[0]->username} and {#$others} other users{/if} wrote comments on the moderation entry "{$moderationQueue->getTitle()}": +{$moderationQueue->getLink()}#comments]]> + userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a comment on the moderation entry {$moderationQueue->getTitle()}.]]> + getAnchorTag()}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} wrote comments on the moderation entry {$moderationQueue->getTitle()}.]]> + + + userID}a guest{else}{@$author->username}{/if} wrote a reply to {@$commentAuthor->username}âs comment on the moderation entry "{$moderationQueue->getTitle()}": +{if $notificationType == 'instant'} +--------------------------------- +{@$response->message} +--------------------------------- +{/if}{$moderationQueue->getLink()}#comments]]> + username}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->username}{if $count == 3} and {@$authors[2]->username}{/if}{/if}}{else}{@$authors[0]->username} and {#$others} other users{/if} wrote replies to comments on the moderation entry "{$moderationQueue->getTitle()}": +{$moderationQueue->getLink()}#comments]]> + userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a reply to a comment by {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} on the moderation entry {$moderationQueue->getTitle()}.]]> + getAnchorTag()}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} wrote replies to comments on the moderation entry {$moderationQueue->getTitle()}.]]> + + @@@ -2456,33 -2402,9 +2459,33 @@@ - + + userID}a guest{else}{@$author->username}{/if} wrote a comment on "{$moderationQueue->getTitle()}" waiting for approval: +{if $notificationType == 'instant'} +--------------------------------- +{@$comment->message} +--------------------------------- +{/if}{$moderationQueue->getLink()}#comments]]> + username}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->username}{if $count == 3} and {@$authors[2]->username}{/if}{/if}{else}{@$authors[0]->username} and {#$others} other users{/if} wrote comments on "{$moderationQueue->getTitle()}" waiting for approval: +{$moderationQueue->getLink()}#comments]]> + userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a comment on {$moderationQueue->getTitle()} waiting for approval.]]> + getAnchorTag()}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} wrote comments on {$moderationQueue->getTitle()} waiting for approval.]]> + + + userID}a guest{else}{@$author->username}{/if} wrote a reply to {@$commentAuthor->username}âs comment on "{$moderationQueue->getTitle()}" waiting for approval: +{if $notificationType == 'instant'} +--------------------------------- +{@$response->message} +--------------------------------- +{/if}{$moderationQueue->getLink()}#comments]]> + username}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->username}{if $count == 3} and {@$authors[2]->username}{/if}{/if}}{else}{@$authors[0]->username} and {#$others} other users{/if} wrote replies to comments on "{$moderationQueue->getTitle()}" waiting for approval: +{$moderationQueue->getLink()}#comments]]> + userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a reply to a comment by {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} on {$moderationQueue->getTitle()} waiting for approval.]]> + getAnchorTag()}{if $count != 1}{if $count == 2} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3} and {@$authors[2]->getAnchorTag()}{/if}{/if}{else}{@$authors[0]->getAnchorTag()} and {#$others} other users{/if} wrote replies to comments on {$moderationQueue->getTitle()} waiting for approval.]]> + + @@@ -2816,7 -2808,7 +2819,7 @@@ You can change your password any time a *}{if REGISTER_PASSWORD_MUST_CONTAIN_SPECIAL_CHAR}{if REGISTER_PASSWORD_MUST_CONTAIN_LOWER_CASE || REGISTER_PASSWORD_MUST_CONTAIN_UPPER_CASE || REGISTER_PASSWORD_MUST_CONTAIN_DIGIT} and {/if}special chars{/if}{/if}.]]> - - ++ - + + activityPoints} Point{if $boxUser->activityPoints != 1}s{/if}]]> + likesReceived} Like{if $boxUser->likesReceived != 1}s{/if}]]> + registrationDate|time}]]> + @@@ -3151,15 -3155,12 +3154,15 @@@ If you do not want to receive further e - + + + + - + - + userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a comment on your wall.]]> @@@ -3204,15 -3205,11 +3207,15 @@@ {/if}{link controller='User' object=$owner isEmail=true}#wall{/link}]]> username}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{@$authors[1]->username}{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if} {@$authors[2]->username}{/if}{/if}{if $guestTimesTriggered} and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{else}{@$authors[0]->username}{if $guestTimesTriggered},{else} and{/if} {#$others} other users {if $guestTimesTriggered}and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{/if} replied to the comment by {$author->username} on your wall: {link controller='User' object=$owner isEmail=true}#wall{/link}]]> - - - - - + + + + + + + - - ++ ++

{lang}wcf.acp.group.assignment.conditions{/lang}

{lang}wcf.acp.group.assignment.conditions{/lang}