Merge pull request #4 from flashwave/analysis-Xl3OO8

i guess i need to adjust VS a bit better
This commit is contained in:
flash 2015-11-08 23:32:13 +01:00
commit bbab143b5e
3 changed files with 36 additions and 35 deletions

View file

@ -722,7 +722,8 @@ class User
} }
// Update a user's userData // Update a user's userData
public function setUserData($data) { public function setUserData($data)
{
// Merge the arrays // Merge the arrays
$data = array_merge($this->userData(), $data); $data = array_merge($this->userData(), $data);