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

Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE

Browse Source 
trigger (Add a protection to avoid multiple errors).
This commit is contained in:
Laurent Destailleur 2014-06-20 16:20:39 +02:00
parent a2724822d7
commit 2dc3e5b104
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,6 +345,8 @@ class Translate
{ {
global $db; global $db;
if (! is_string($key)) return 'ErrorBadValueForParamNotAString'; // Avoid multiple errors with code not using function correctly.
//print 'xx'.$key; //print 'xx'.$key;
$newstr=$key; $newstr=$key;
if (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i',$key,$reg)) if (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i',$key,$reg))
@ -659,7 +661,7 @@ class Translate
//print 'param: '.$key.'-'.$keydatabase.'-'.$this->trans($key); exit; //print 'param: '.$key.'-'.$keydatabase.'-'.$this->trans($key); exit;
// Check if in language array (this can call getTradFromKey) // Check if a translation is available (this can call getTradFromKey)
if ($this->transnoentitiesnoconv($key) != $key) if ($this->transnoentitiesnoconv($key) != $key)
{ {
return $this->transnoentitiesnoconv($key); // Found in language array return $this->transnoentitiesnoconv($key); // Found in language array