From 1602f3b0d0bca023a50fc2abed76d262290d4d88 Mon Sep 17 00:00:00 2001 From: Benjamin Roberts Date: Wed, 4 Jul 2018 23:10:30 +1000 Subject: [PATCH 1/2] Fix infinite loop when parsing update.sh arguments update.sh would enter an infinite loop when arguments (e.g. --ours, --check). This is due to a missing `shift` statement that has now been added. This fixes #1193. --- update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/update.sh b/update.sh index e83a473f..88903ad0 100755 --- a/update.sh +++ b/update.sh @@ -28,6 +28,7 @@ while (($#)); do MERGE_STRATEGY=ours ;; esac + shift done [[ ! -f mailcow.conf ]] && { echo "mailcow.conf is missing"; exit 1;} From a7e5e0d34364e6ca3da47753ca0231f920db6441 Mon Sep 17 00:00:00 2001 From: DynamicThijs <40541903+DynamicThijs@users.noreply.github.com> Date: Thu, 5 Jul 2018 10:19:04 +0200 Subject: [PATCH 2/2] Fix typo in lang.en.php --- data/web/lang/lang.en.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php index d5602beb..c20d0a41 100644 --- a/data/web/lang/lang.en.php +++ b/data/web/lang/lang.en.php @@ -125,7 +125,7 @@ $lang['user']['weeks'] = 'Weeks'; $lang['user']['spamfilter'] = 'Spam filter'; $lang['admin']['spamfilter'] = 'Spam filter'; $lang['user']['spamfilter_wl'] = 'Whitelist'; -$lang['user']['spamfilter_wl_desc'] = 'Whitelisted email addresses to never classify as spam. Wildcards may be used. A filter is only applied to direct aliases (aliases with a single target mailbox) exclulding catch-all aliases and a mailbox itself.'; +$lang['user']['spamfilter_wl_desc'] = 'Whitelisted email addresses to never classify as spam. Wildcards may be used. A filter is only applied to direct aliases (aliases with a single target mailbox) excluding catch-all aliases and a mailbox itself.'; $lang['user']['spamfilter_bl'] = 'Blacklist'; $lang['user']['spamfilter_bl_desc'] = 'Blacklisted email addresses to always classify as spam and reject. Wildcards may be used. A filter is only applied to direct aliases (aliases with a single target mailbox) excluding catch-all aliases and a mailbox itself.'; $lang['user']['spamfilter_behavior'] = 'Rating';