fix: Fix "validate email"-related issues (#2512)

* fix: Make sure $disable_aside is initialized

There was a warning for an uninitialized variable, hidden in production
but visible in development mode.

* fix: Allow to delete account when email isn't validated
This commit is contained in:
Marien Fressinaud
2019-08-29 18:08:43 +02:00
committed by Alexandre Alapetite
parent 18efce3543
commit 84f9311fd5
3 changed files with 7 additions and 1 deletions

View File

@@ -123,6 +123,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
}
$email_not_verified = FreshRSS_Context::$user_conf->email_validation_token !== '';
$this->view->disable_aside = false;
if ($email_not_verified) {
$this->view->_layout('simple');
$this->view->disable_aside = true;