-
-
Notifications
You must be signed in to change notification settings - Fork 4k
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(sab): put location in proper address field #38856
fix(sab): put location in proper address field #38856
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code-wise that's good, but it wasn't assumed the profile Location field was a city before, so this seems a little problematic for people who entered a full street address in that field. 🤷
Yeah. I think no matter how we name or hint the profile property, it's never going to be perfect. |
Thx for context! |
apps/dav/lib/CardDAV/Converter.php
Outdated
$vCard->add(new Text($vCard, 'ADR', [null, null, null, $property->getValue(), null, null, null], | ||
['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope])); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$vCard->add(new Text($vCard, 'ADR', [null, null, null, $property->getValue(), null, null, null], | |
['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope])); | |
$vCard->add( | |
new Text( | |
$vCard, | |
'ADR', | |
[ null, null, null, $property->getValue(), null, null, null ], | |
[ | |
'TYPE' => 'OTHER', | |
'X-NC-SCOPE' => $scope, | |
], | |
) | |
); |
My take at formatting this long line 😄
/backport to stable27 |
04ef8e2
to
8a9b1d8
Compare
Replaced null with '' to make pipeline (phpunit) happy |
Signed-off-by: Johannes Merkel <[email protected]>
8a9b1d8
to
3cb8968
Compare
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 |
Summary
Checklist