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

Jump to bottom

[stable23] Avoid use of iconv to get rid of unicode #29965

Merged
merged 1 commit into from
Dec 20, 2021
Merged

[stable23] Avoid use of iconv to get rid of unicode #29965

merged 1 commit into from
Dec 20, 2021

Conversation

MichaIng
Copy link
Member

Manual backport of: #29470

@MichaIng MichaIng added 3. to review Waiting for reviews feature: ldap labels Nov 29, 2021
@MichaIng MichaIng added this to the Nextcloud 23 milestone Nov 29, 2021
@MichaIng
Copy link
Member Author

How to correctly sign-off when manually backporting someone else's commit? 🤔

@CarlSchwan
Copy link
Member

How to correctly sign-off when manually backporting someone else's commit? thinking

Probably by using git commit --amend --author 'Author name <email>' or something similar. And add a Co-authored-by: tag

@MichaIng MichaIng force-pushed the backport/29470/stable23 branch from e3a934a to ddde33f Compare November 29, 2021 16:52
@MichaIng
Copy link
Member Author

Co-authored-by: did the trick 👍.

@MichaIng
Copy link
Member Author

Not sure why backportbot failed as I don't see any difference in the code. Let's see whether it works from here.

@MichaIng
Copy link
Member Author

/backport to stable22

@MichaIng
Copy link
Member Author

/backport to stable21

@MichaIng
Copy link
Member Author

MichaIng commented Nov 30, 2021 •
edited
Loading

Additionally we should manually backport: #29958

@blizzz blizzz modified the milestones: Nextcloud 23, Nextcloud 23.0.1 Nov 30, 2021
@come-nc @MichaIng
[stable23] Avoid use of iconv to get rid of unicode
4010e58 
Using iconv for translit depends upon server configuration, locale, and
 PHP version. Using htmlentities instead to have a consistent behavior
 independent of configuration.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Co-authored-by: MichaIng <micha@dietpi.com>
@MichaIng MichaIng force-pushed the backport/29470/stable23 branch from ddde33f to 4010e58 Compare December 20, 2021 02:00
@come-nc come-nc merged commit e0c6673 into stable23 Dec 20, 2021
@come-nc come-nc deleted the backport/29470/stable23 branch December 20, 2021 09:54
This was referenced Dec 20, 2021
Merged
Merged
@MichaIng MichaIng mentioned this pull request Dec 20, 2021
Merged
@skjnldsv skjnldsv mentioned this pull request Jan 7, 2022
Merged
6 tasks
This was referenced Jan 20, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@come-nc come-nc come-nc approved these changes

@blizzz blizzz blizzz approved these changes

@CarlSchwan CarlSchwan Awaiting requested review from CarlSchwan

Assignees
No one assigned
Labels
3. to review Waiting for reviews feature: ldap
Projects
None yet
Milestone
Nextcloud 23.0.1
Development

Successfully merging this pull request may close these issues.
4 participants
@MichaIng @CarlSchwan @blizzz @come-nc