diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-11-06 14:06:02 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-11-06 14:06:02 +0100 |
| commit | 6a7b5fea3ec301214527f4d8c888cca11d9125e5 (patch) | |
| tree | 00d7d71d6015e78b036746e65d62eb5fc8755b0f /app/Models | |
| parent | 60941b9a40731be6f06d9422744cbba27982b6f3 (diff) | |
| parent | 1a4fdfb1be7b638f5bfd1011e0f81f5814591474 (diff) | |
Merge branch 'FreshRSS/dev' into git-update
Diffstat (limited to 'app/Models')
| -rw-r--r-- | app/Models/Factory.php | 1 | ||||
| -rw-r--r-- | app/Models/UserDAO.php | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/Models/Factory.php b/app/Models/Factory.php index 764987c46..6502c38b7 100644 --- a/app/Models/Factory.php +++ b/app/Models/Factory.php @@ -6,6 +6,7 @@ class FreshRSS_Factory { $conf = Minz_Configuration::get('system'); switch ($conf->db['type']) { case 'sqlite': + case 'pgsql': return new FreshRSS_FeedDAOSQLite($username); default: return new FreshRSS_FeedDAO($username); diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php index 190954b1a..32bc6de2f 100644 --- a/app/Models/UserDAO.php +++ b/app/Models/UserDAO.php @@ -88,7 +88,6 @@ class FreshRSS_UserDAO extends Minz_ModelPdo { if (($username == '') || (!ctype_alnum($username))) { $username = Minz_Session::param('currentUser', '_'); } - Minz_Log::debug('touch ' . $username); return touch(join_path(DATA_PATH , 'users', $username, 'config.php')); } |