Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
This commit is contained in:
Laurent Destailleur
2016-10-01 18:42:50 +02:00
parent fcb00dbaf2 6f26a7390e
commit ee252f549a
38 changed files with 344 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/CMailFile.class.php
View File

@@ -1105,12 +1105,12 @@ class CMailFile
$_retVal = true; // Indicates if Object was created or not
$server_response = '';
while ( substr($server_response,3,1) != ' ' )
while (substr($server_response,3,1) != ' ')
{
if( !( $server_response = fgets($socket, 256) ) )
if (! ($server_response = fgets($socket, 256)) )
{
$this->error="Couldn't get mail server response codes";
$_retVal = false;
return false;
}
}