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

Fix: Do not run request if param is empty

Browse Source
This commit is contained in:
Laurent Destailleur 2012-08-08 14:07:04 +02:00
parent db4240afad
commit d090788caa
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/lib/company.lib.php
View File

@ -222,12 +222,18 @@ function getCountry($id,$withcode='',$dbtouse=0,$outputlangs='',$entconv=1)
{ {
global $db,$langs; global $db,$langs;
// Check parameters
if (empty($id))
{
if ($withcode === 'all') return array('id'=>'','code'=>'','label'=>'');
else return '';
}
if (! is_object($dbtouse)) $dbtouse=$db; if (! is_object($dbtouse)) $dbtouse=$db;
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
$sql = "SELECT rowid, code, libelle FROM ".MAIN_DB_PREFIX."c_pays"; $sql = "SELECT rowid, code, libelle FROM ".MAIN_DB_PREFIX."c_pays";
if (is_numeric($id)) $sql.= " WHERE rowid=".$id; if (is_numeric($id)) $sql.= " WHERE rowid=".$id;
else $sql.= " WHERE code='".$id."'"; else $sql.= " WHERE code='".$db->escape($id)."'";
dol_syslog("Company.lib::getCountry sql=".$sql); dol_syslog("Company.lib::getCountry sql=".$sql);
$resql=$dbtouse->query($sql); $resql=$dbtouse->query($sql);
@ -251,10 +257,11 @@ function getCountry($id,$withcode='',$dbtouse=0,$outputlangs='',$entconv=1)
} }
else else
{ {
return "NotDefined"; return 'NotDefined';
} }
} }
else dol_print_error($dbtouse,''); else dol_print_error($dbtouse,'');
return 'Error';
} }
/** /**