lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: dol_is_dir may not be loaded, so call fails

Browse Source
This commit is contained in:
Laurent Destailleur 2013-03-08 01:50:16 +01:00
parent 970b332bd8
commit c74f68d14a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/translate.class.php
View File

@ -399,7 +399,7 @@ class Translate
if ($tmparray2[0]==$key) { $str=$tmparray2[1]; break; } if ($tmparray2[0]==$key) { $str=$tmparray2[1]; break; }
} }
} }
if (! preg_match('/^Format/',$key)) $str=sprintf($str,$param1,$param2,$param3,$param4); // Replace %s and %d except for FormatXXX strings. if (! preg_match('/^Format/',$key)) $str=sprintf($str,$param1,$param2,$param3,$param4); // Replace %s and %d except for FormatXXX strings.
if ($maxsize) $str=dol_trunc($str,$maxsize); if ($maxsize) $str=dol_trunc($str,$maxsize);
@ -460,7 +460,7 @@ class Translate
function transnoentitiesnoconv($key, $param1='', $param2='', $param3='', $param4='') function transnoentitiesnoconv($key, $param1='', $param2='', $param3='', $param4='')
{ {
global $conf; global $conf;
if (! empty($this->tab_translate[$key])) // Translation is available if (! empty($this->tab_translate[$key])) // Translation is available
{ {
$str=$this->tab_translate[$key]; $str=$this->tab_translate[$key];
@ -476,7 +476,7 @@ class Translate
if ($tmparray2[0]==$key) { $str=$tmparray2[1]; break; } if ($tmparray2[0]==$key) { $str=$tmparray2[1]; break; }
} }
} }
if (! preg_match('/^Format/',$key)) $str=sprintf($str,$param1,$param2,$param3,$param4); // Replace %s and %d except for FormatXXX strings. if (! preg_match('/^Format/',$key)) $str=sprintf($str,$param1,$param2,$param3,$param4); // Replace %s and %d except for FormatXXX strings.
} }
else else
@ -616,7 +616,7 @@ class Translate
$newdir=dol_osencode($dir); $newdir=dol_osencode($dir);
// Check if directory exists // Check if directory exists
if (! dol_is_dir($dir)) continue; if (! is_dir($newdir)) continue; // We must not use dol_is_dir here, function may not be loaded
$fonc='numberwords'; $fonc='numberwords';
if (file_exists($newdir.'/functions_'.$fonc.'.lib.php')) if (file_exists($newdir.'/functions_'.$fonc.'.lib.php'))