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

Fix: Bad test

Browse Source
This commit is contained in:
Laurent Destailleur 2014-11-12 10:05:40 +01:00
parent 137b3f898d
commit 81f0d953e3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/admin/syslog.php
View File

@ -183,8 +183,9 @@ foreach ($syslogModules as $moduleName)
{ {
$module = new $moduleName; $module = new $moduleName;
$moduleactive=$module->isActive(); $moduleactive=(int) $module->isActive();
if ($moduleactive == -1 && empty($conf->global->MAIN_FEATURES_LEVEL)) continue; // Some modules are hidden if not activable and not into debug mode (end user must not see them) //print $moduleName." = ".$moduleactive." - ".$module->getName()." ".($moduleactive == -1)."<br>\n";
if (($moduleactive == -1) && empty($conf->global->MAIN_FEATURES_LEVEL)) continue; // Some modules are hidden if not activable and not into debug mode (end user must not see them)
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
@ -199,7 +200,7 @@ foreach ($syslogModules as $moduleName)
{ {
foreach ($setuparray as $option) foreach ($setuparray as $option)
{ {
if (isset($_POST[$option['constant']])) $value=$_POST[$option['constant']]; if (isset($_POST[$option['constant']])) $value=$_POST[$option['constant']];
else if (defined($option['constant'])) $value = constant($option['constant']); else if (defined($option['constant'])) $value = constant($option['constant']);
else $value = (isset($option['default']) ? $option['default'] : ''); else $value = (isset($option['default']) ? $option['default'] : '');
@ -220,7 +221,7 @@ foreach ($syslogModules as $moduleName)
print "</table>\n"; print "</table>\n";
print "</form>\n"; print "</form>\n";
print '<br>'; print '<br>'."\n\n";
print_titre($langs->trans("SyslogLevel")); print_titre($langs->trans("SyslogLevel"));

2
htdocs/contact/class/contact.class.php
View File

@ -910,7 +910,7 @@ class Contact extends CommonObject
global $langs; global $langs;
$langs->load("dict"); $langs->load("dict");
$code=(! empty($this->civility_id)?$this->civility_id:(! empty($this->civility_id)?$this->civility_id:'')); $code=(! empty($this->civility_id)?$this->civility_id:(! empty($this->civilite_id)?$this->civilite_id:''));
if (empty($code)) return ''; if (empty($code)) return '';
return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code); return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
} }