Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 04:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Optimize perf for function

Browse Source
This commit is contained in:
Laurent Destailleur
2010-08-24 21:29:47 +00:00
parent 6d179229d1
commit eb33a6f30a
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/lib/functions.lib.php
View File

@@ -957,22 +957,12 @@ function isValidEmail($address)
* @param $stringencoding * @param $stringencoding
* @return int * @return int
*/ */
function dol_strlen($string,$stringencoding='') function dol_strlen($string,$stringencoding='UTF-8')
{ {
global $langs; // print $stringencoding."xxx";
// $stringencoding='rrr';
if (empty($stringencoding)) $stringencoding=(empty($langs->charset_output)?'UTF-8':$langs->charset_output); if (function_exists('mb_strlen')) return mb_strlen($string,$stringencoding);
else return strlen($string);
$ret='';
if (function_exists('mb_strlen'))
{
$ret=mb_strlen($string,$stringencoding);
}
else
{
$ret=strlen($string);
}
return $ret;
} }
/** /**
@@ -1019,7 +1009,7 @@ function dolibarr_trunc($string,$size=40,$trunc='right',$stringencoding='')
* \return string Truncated string * \return string Truncated string
* \remarks MAIN_DISABLE_TRUNC=1 can disable all truncings * \remarks MAIN_DISABLE_TRUNC=1 can disable all truncings
*/ */
function dol_trunc($string,$size=40,$trunc='right',$stringencoding='') function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8')
{ {
global $conf; global $conf;