- Fixed a bug within the merge
This commit is contained in:
parent
10ad77d607
commit
cef536caa5
|
@ -12,57 +12,57 @@ class User {
|
|||
public int $id;
|
||||
|
||||
/**
|
||||
* @Field("size" => 35, "name" => "first_name")
|
||||
* @Field("length" => 35, "name" => "first_name")
|
||||
*/
|
||||
public ? string $firstName;
|
||||
|
||||
/**
|
||||
* @Field("size" => 35, "name" => "last_name")
|
||||
* @Field("length" => 35, "name" => "last_name")
|
||||
*/
|
||||
public ? string $lastName;
|
||||
|
||||
/**
|
||||
* @Field("size" => 255)
|
||||
* @Field("length" => 255)
|
||||
*/
|
||||
public string $email;
|
||||
|
||||
/**
|
||||
* @Field("size" => 150)
|
||||
* @Field("length" => 150)
|
||||
*/
|
||||
public ? string $address;
|
||||
|
||||
/**
|
||||
* @Field("size" => 15, 'name' => "zip_code")
|
||||
* @Field("length" => 15, 'name' => "zip_code")
|
||||
*/
|
||||
public ? string $zipCode;
|
||||
|
||||
/**
|
||||
* @Field("size" => 45)
|
||||
* @Field("length" => 45)
|
||||
*/
|
||||
public ? string $province;
|
||||
|
||||
/**
|
||||
* @Field("size" => 3)
|
||||
* @Field("length" => 3)
|
||||
*/
|
||||
public ? string $country;
|
||||
|
||||
/**
|
||||
* @Field("size" => 15)
|
||||
* @Field("length" => 15)
|
||||
*/
|
||||
public ? string $phone;
|
||||
|
||||
/**
|
||||
* @Field("size" => 15)
|
||||
* @Field("length" => 15)
|
||||
*/
|
||||
public ? string $ext;
|
||||
|
||||
/**
|
||||
* @Field("size" => 15)
|
||||
* @Field("length" => 15)
|
||||
*/
|
||||
public ? string $mobile;
|
||||
|
||||
/**
|
||||
* @Field("size" => 255)
|
||||
* @Field("length" => 255)
|
||||
*/
|
||||
public ? string $username;
|
||||
|
||||
|
|
|
@ -123,7 +123,9 @@ class Authenticate {
|
|||
$this->cookie->delete('user.id');
|
||||
}
|
||||
|
||||
$this->user->logged = false;
|
||||
if (isset($this->user)) {
|
||||
$this->user->logged = false;
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue