mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 11:49:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #732, avoid conflict with PHP function "transliterate"

Browse source
This commit is contained in:
plegall 2017-07-13 11:29:27 +02:00
parent f520f82736
commit a3cf80c77c
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/functions.inc.php
View file

@ -337,7 +337,7 @@ if (function_exists('mb_strtolower') && defined('PWG_CHARSET'))
* @param string $term * @param string $term
* @return string * @return string
*/ */
function transliterate($term) function pwg_transliterate($term)
{ {
return remove_accents( mb_strtolower($term, PWG_CHARSET) ); return remove_accents( mb_strtolower($term, PWG_CHARSET) );
} }
@ -347,7 +347,7 @@ else
/** /**
* @ignore * @ignore
*/ */
function transliterate($term) function pwg_transliterate($term)
{ {
return remove_accents( strtolower($term) ); return remove_accents( strtolower($term) );
} }
@ -361,7 +361,7 @@ else
*/ */
function str2url($str) function str2url($str)
{ {
$str = $safe = transliterate($str); $str = $safe = pwg_transliterate($str);
$str = preg_replace('/[^\x80-\xffa-z0-9_\s\'\:\/\[\],-]/','',$str); $str = preg_replace('/[^\x80-\xffa-z0-9_\s\'\:\/\[\],-]/','',$str);
$str = preg_replace('/[\s\'\:\/\[\],-]+/',' ',trim($str)); $str = preg_replace('/[\s\'\:\/\[\],-]+/',' ',trim($str));
$res = str_replace(' ','_',$str); $res = str_replace(' ','_',$str);

2
include/functions_html.inc.php
View file

@ -261,7 +261,7 @@ function tag_alpha_compare($a, $b)
{ {
if (!isset($cache[__FUNCTION__][ $tag['name'] ])) if (!isset($cache[__FUNCTION__][ $tag['name'] ]))
{ {
$cache[__FUNCTION__][ $tag['name'] ] = transliterate($tag['name']); $cache[__FUNCTION__][ $tag['name'] ] = pwg_transliterate($tag['name']);
} }
} }

2
tags.php
View file

@ -101,7 +101,7 @@ if ($page['display_mode'] == 'letters') {
foreach ($tags as $tag) foreach ($tags as $tag)
{ {
$tag_letter = mb_strtoupper(mb_substr(transliterate($tag['name']), 0, 1, PWG_CHARSET), PWG_CHARSET); $tag_letter = mb_strtoupper(mb_substr(pwg_transliterate($tag['name']), 0, 1, PWG_CHARSET), PWG_CHARSET);
if ($current_tag_idx==0) { if ($current_tag_idx==0) {
$current_letter = $tag_letter; $current_letter = $tag_letter;