diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controllers/userController.php | 2 | ||||
| -rw-r--r-- | app/Models/UserDAO.php | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index f23ae008e..1eb7f2b84 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -389,8 +389,10 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { $ok &= is_dir($user_data); if ($ok) { FreshRSS_fever_Util::deleteKey($username); + Minz_ModelPdo::$usesSharedPdo = false; $oldUserDAO = FreshRSS_Factory::createUserDao($username); $ok &= $oldUserDAO->deleteUser(); + Minz_ModelPdo::$usesSharedPdo = true; $ok &= recursive_unlink($user_data); $filenames = glob(PSHB_PATH . '/feeds/*/' . $username . '.txt'); if (!empty($filenames)) { diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php index 1f85b5fe9..9ce0d7bd7 100644 --- a/app/Models/UserDAO.php +++ b/app/Models/UserDAO.php @@ -32,6 +32,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo { $ok = $this->pdo->exec($GLOBALS['SQL_DROP_TABLES']) !== false; if ($ok) { + $this->close(); return true; } else { $info = $this->pdo->errorInfo(); |