Skip to content

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

Merged
ChristophWurst merged 1 commit into
masterfrom
fix/capitalization-other-tel
May 25, 2023
Merged

fix(carddav): Make system contact phone number RFC compliant#38454
ChristophWurst merged 1 commit into
masterfrom
fix/capitalization-other-tel

Conversation

@GretaD

@GretaDGretaD commented May 25, 2023

Copy link
Copy Markdown
Contributor

Summary

The RFC specs the allowed types for a TEL property:

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

Checklist

@GretaDGretaD added bug 3. to review Waiting for reviews labels May 25, 2023
@GretaDGretaD self-assigned this May 25, 2023

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
Member

/backport to stable27

@GretaDGretaD changed the title Fix the capitalization of phone type=otherfix(carddav): Make system contact phone number RFC compliantMay 25, 2023
@ChristophWurst

Copy link
Copy Markdown
Member

@GretaD you have to amend to change the commit title

Signed-off-by: greta <gretadoci@gmail.com>
@GretaD
GretaDforce-pushed the fix/capitalization-other-tel branch from 9dbf552 to 50b61c8CompareMay 25, 2023 09:11
@ChristophWurstChristophWurst 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 merged commit 9780472 into masterMay 25, 2023
@ChristophWurst
ChristophWurst deleted the fix/capitalization-other-tel branch May 25, 2023 13:56
@backportbot-nextcloud

Copy link
Copy Markdown

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
Copy Markdown
Member

/backport to stable27

@backportbot-nextcloud

Copy link
Copy Markdown

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
Copy Markdown
Member

/backport to stable27

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

"OTHER phone" vs "Other email"

5 participants

@GretaD@ChristophWurst@tcitworld@hamza221@JohannesGGE