aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Models/UserDAO.php1
-rw-r--r--app/install.php4
2 files changed, 2 insertions, 3 deletions
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'));
}
diff --git a/app/install.php b/app/install.php
index fcc901713..5c8a6e0e8 100644
--- a/app/install.php
+++ b/app/install.php
@@ -230,7 +230,7 @@ function saveStep3() {
$_SESSION['bd_error'] = '';
header('Location: index.php?step=4');
} else {
- $_SESSION['bd_error'] = empty($config_array['db']['bd_error']) ? 'Unknown error!' : $config_array['db']['bd_error'];
+ $_SESSION['bd_error'] = empty($config_array['db']['error']) ? 'Unknown error!' : $config_array['db']['error'];
}
}
invalidateHttpCache();
@@ -375,7 +375,7 @@ function checkDbUser(&$dbOptions) {
}
} catch (PDOException $e) {
$ok = false;
- $dbOptions['bd_error'] = $e->getMessage();
+ $dbOptions['error'] = $e->getMessage();
}
return $ok;
}