diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-05-02 12:31:49 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-05-02 12:32:51 +0000 |
| commit | b65383182b087d278de4850917e1037abef8acb1 (patch) | |
| tree | 7ab81e49f1fdb05e78db149815c6861943c7dd4e /community/nextcloud/iconv-ascii-translit-not-supported.patch | |
| parent | 952b59f9e08c6ee9af241bf1eae831d612930459 (diff) | |
| download | aports-b65383182b087d278de4850917e1037abef8acb1.tar.bz2 aports-b65383182b087d278de4850917e1037abef8acb1.tar.xz | |
community/nextcloud: remove local _pkgver which was used in source for RC releases
Diffstat (limited to 'community/nextcloud/iconv-ascii-translit-not-supported.patch')
| -rw-r--r-- | community/nextcloud/iconv-ascii-translit-not-supported.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/community/nextcloud/iconv-ascii-translit-not-supported.patch b/community/nextcloud/iconv-ascii-translit-not-supported.patch index 8c0825d4fe..f599a1b020 100644 --- a/community/nextcloud/iconv-ascii-translit-not-supported.patch +++ b/community/nextcloud/iconv-ascii-translit-not-supported.patch @@ -1,13 +1,11 @@ -iconv on Alpine does not support conversion to ASCII//TRANSLIT - --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php -@@ -1200,7 +1200,7 @@ +@@ -1318,7 +1318,7 @@ + } - // Transliteration - // latin characters to ASCII -- $name = iconv('UTF-8', 'ASCII//TRANSLIT', $name); -+ $name = iconv('UTF-8', 'ASCII', $name); - - // Replacements - $name = str_replace(' ', '_', $name); + // Transliteration to ASCII +- $transliterated = @iconv('UTF-8', 'ASCII//TRANSLIT', $name); ++ $transliterated = @iconv('UTF-8', 'ASCII', $name); + if($transliterated !== false) { + // depending on system config iconv can work or not + $name = $transliterated; |