Merge branch '1.0-local' into 1.0

This commit is contained in:
xdrm-brackets 2017-02-23 16:30:49 +01:00
commit d68c01852f
1 changed files with 6 additions and 6 deletions

View File

@ -294,15 +294,15 @@
/* (1) Check file */
$gstate = $f_gstate->current();
if( $f_gstate === false )
if( !$gstate )
return 127;
/* (2) Remove surrounding spaces */
$f_gstate = preg_replace('@^\s+@', '', $f_gstate);
$f_gstate = preg_replace('@\s+$@', '', $f_gstate);
/* (3) Remove surrounding spaces */
$gstate = preg_replace('@^\s+@', '', $gstate);
$gstate = preg_replace('@\s+$@', '', $gstate);
/* (3) Manage error */
if( strlen($state) < 1 )
/* (4) Manage error */
if( strlen($gstate) < 1 )
return 127;
return 0;