Merge branch 'master' into 0.10

This commit is contained in:
Shoghi Cervantes
2014-10-20 12:53:14 +02:00
15 changed files with 92 additions and 50 deletions

View File

@@ -66,7 +66,7 @@ class QueryHandler{
public function regenerateToken(){
$this->lastToken = $this->token;
$this->token = Utils::getRandomBytes(16, false);
$this->token = @Utils::getRandomBytes(16, false);
}
public static function getTokenString($token, $salt){