Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add backward-compat if CIVI_DOMAIN_EMAIL is in old format #912

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add backward-compat if CIVI_DOMAIN_EMAIL is in old format #912

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/civibuild.lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,10 @@ function civicrm_update_domain() {
AND value = '1';
EOSQL
else
# Backward-compat: Extract email from inside angle brackets if using the old format
if [[ "$CIVI_DOMAIN_EMAIL" =~ \<.*\> ]]; then
CIVI_DOMAIN_EMAIL=$(echo "$CIVI_DOMAIN_EMAIL" | sed -n 's/.*<\([^>]*\)>.*/\1/p')
fi
cvutil_php_nodbg amp sql -Ncivi --root="$CMS_ROOT" <<EOSQL
UPDATE civicrm_domain SET name = '$CIVI_DOMAIN_NAME';
UPDATE civicrm_site_email_address
Expand Down