iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
* @return string
*/
function transliterate($term)
function pwg_transliterate($term)
{
return remove_accents( mb_strtolower($term, PWG_CHARSET) );
}
@@ -347,7 +347,7 @@ else
/**
* @ignore
*/
function transliterate($term)
function pwg_transliterate($term)
{
return remove_accents( strtolower($term) );
}
@@ -361,7 +361,7 @@ else
*/
function str2url($str)
{
$str = $safe = transliterate($str);
$str = $safe = pwg_transliterate($str);
$str = preg_replace('/[^\x80-\xffa-z0-9_\s\'\:\/\[\],-]/','',$str);
$str = preg_replace('/[\s\'\:\/\[\],-]+/',' ',trim($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'] ]))
{
$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)
{
$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) {
$current_letter = $tag_letter;