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.

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

fix(carddav): Make system contact phone number RFC compliant #38454

Merged
merged 1 commit into from
May 25, 2023

Conversation

GretaD
Copy link
Contributor

@GretaD GretaD commented May 25, 2023

Summary

The RFC specs the allowed types for a TEL property:

$vCard->add(new Text($vCard, 'TEL', $property->getValue(), ['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope]));
. OTHER is invalid. This was a bad copy-paste from another prop.

Checklist

@GretaD GretaD added bug 3. to review Waiting for reviews labels May 25, 2023
@GretaD GretaD self-assigned this May 25, 2023
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works but commit and PR title are really misleading

change it to fix(carddav): Make system contact phone number RFC compliant

We are not fixing the capitalization here. We are fixing an invalid TEL property in the system contact vcard.

@ChristophWurst
Copy link
Member

/backport to stable27

@GretaD GretaD changed the title Fix the capitalization of phone type=other fix(carddav): Make system contact phone number RFC compliant May 25, 2023
@ChristophWurst
Copy link
Member

@GretaD you have to amend to change the commit title

Signed-off-by: greta <gretadoci@gmail.com>
@GretaD GretaD force-pushed the fix/capitalization-other-tel branch from 9dbf552 to 50b61c8 Compare May 25, 2023 09:11
@ChristophWurst ChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels May 25, 2023
@ChristophWurst ChristophWurst enabled auto-merge May 25, 2023 10:38
@ChristophWurst ChristophWurst disabled auto-merge May 25, 2023 13:56
@ChristophWurst ChristophWurst merged commit 9780472 into master May 25, 2023
@ChristophWurst ChristophWurst deleted the fix/capitalization-other-tel branch May 25, 2023 13:56
@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin/stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@ChristophWurst
Copy link
Member

/backport to stable27

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin/stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@ChristophWurst
Copy link
Member

/backport to stable27

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"OTHER phone" vs "Other email"
5 participants