Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix missing messages in error report.

Browse Source 
Fix test on non empty array
This commit is contained in:
Laurent Destailleur
2017-12-19 18:26:27 +01:00
parent 016be9139b
commit 12d91d7444
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev/setup/codesniffer/ruleset.xml
View File

@@ -131,7 +131,7 @@
</rule> </rule>
<rule ref="Generic.Metrics.NestingLevel"> <rule ref="Generic.Metrics.NestingLevel">
<properties> <properties>
<property name="nestingLevel" value="10" /> <property name="nestingLevel" value="12" />
<property name="absoluteNestingLevel" value="50" /> <property name="absoluteNestingLevel" value="50" />
</properties> </properties>
</rule> </rule>

2
htdocs/core/class/html.formmail.class.php
View File

@@ -755,7 +755,7 @@ class FormMail extends Form
$defaulttopic=GETPOST('subject','none'); $defaulttopic=GETPOST('subject','none');
if (! GETPOST('modelselected','alpha') || GETPOST('modelmailselected') != '-1') if (! GETPOST('modelselected','alpha') || GETPOST('modelmailselected') != '-1')
{ {
if (count($arraydefaultmessage) > 0 && $arraydefaultmessage['topic']) $defaulttopic=$arraydefaultmessage['topic']; if (is_array($arraydefaultmessage) && count($arraydefaultmessage) > 0 && $arraydefaultmessage['topic']) $defaulttopic=$arraydefaultmessage['topic'];
elseif (! is_numeric($this->withtopic)) $defaulttopic=$this->withtopic; elseif (! is_numeric($this->withtopic)) $defaulttopic=$this->withtopic;
} }

10
htdocs/core/lib/functions.lib.php
View File

@@ -3492,9 +3492,10 @@ function dol_print_error($db='',$error='',$errors=null)
* *
* @param string $prefixcode Prefix of public error code * @param string $prefixcode Prefix of public error code
* @param string $errormessage Complete error message * @param string $errormessage Complete error message
* @param array $errormessages Array of error messages
* @return void * @return void
*/ */
function dol_print_error_email($prefixcode, $errormessage='') function dol_print_error_email($prefixcode, $errormessage='', $errormessages=array())
{ {
global $langs,$conf; global $langs,$conf;
@@ -3503,6 +3504,13 @@ function dol_print_error_email($prefixcode, $errormessage='')
print '<br><div class="center login_main_message"><div class="error">'; print '<br><div class="center login_main_message"><div class="error">';
print $langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now,'%Y%m%d')); print $langs->trans("ErrorContactEMail", $conf->global->MAIN_INFO_SOCIETE_MAIL, $prefixcode.dol_print_date($now,'%Y%m%d'));
if ($errormessage) print '<br><br>'.$errormessage; if ($errormessage) print '<br><br>'.$errormessage;
if (is_array($errormessages) && count($errormessages))
{
foreach($errormessages as $mesgtoshow)
{
print '<br><br>'.$mesgtoshow;
}
}
print '</div></div>'; print '</div></div>';
} }