Merge branch '1.0-local' into 1.0

This commit is contained in:
xdrm-brackets 2017-02-23 17:15:34 +01:00
commit 09aba53aa5
1 changed files with 0 additions and 4 deletions

View File

@ -195,7 +195,6 @@
$action = $actionlist[$toPerform];
var_dump($action);
/* [5] Process the action on the STATE
=========================================================*/
/* (1) Update the state with the found action */
@ -213,14 +212,11 @@
/* (2) Update the state file */
var_dump('before : '.get_gstate());
var_dump('towrite : '.$state);
$written = @file_put_contents(STATE_CONF, $state);
/* (3) Manage error */
if( $written === false )
slog('cannot update STATE file', 'mfrc522:loop');
var_dump('after : '.get_gstate());