diff --git a/classes/handler/public.php b/classes/handler/public.php
index 3e868d56e..727976a82 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -732,6 +732,8 @@ class Handler_Public extends Handler {
}
function forgotpass() {
+ startup_gettext();
+
header('Content-Type: text/html; charset=utf-8');
print "Tiny Tiny RSS";
@@ -825,6 +827,8 @@ class Handler_Public extends Handler {
}
function dbupdate() {
+ startup_gettext();
+
if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
$_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
render_login_form();
diff --git a/include/functions.php b/include/functions.php
index 01ffa751f..bad01eb96 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -961,23 +961,28 @@
}
function file_is_locked($filename) {
- if (function_exists('flock') && file_exists(LOCK_DIRECTORY . "/$filename")) {
- $fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
- if ($fp) {
- if (flock($fp, LOCK_EX | LOCK_NB)) {
- flock($fp, LOCK_UN);
+ if (file_exists(LOCK_DIRECTORY . "/$filename")) {
+ if (function_exists('flock')) {
+ $fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
+ if ($fp) {
+ if (flock($fp, LOCK_EX | LOCK_NB)) {
+ flock($fp, LOCK_UN);
+ fclose($fp);
+ return false;
+ }
fclose($fp);
+ return true;
+ } else {
return false;
}
- fclose($fp);
- return true;
- } else {
- return false;
}
+ return true; // consider the file always locked and skip the test
+ } else {
+ return false;
}
- return true; // consider the file always locked and skip the test
}
+
function make_lockfile($filename) {
$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
diff --git a/include/login_form.php b/include/login_form.php
index 0637c453a..891e25e13 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -1,3 +1,4 @@
+
Tiny Tiny RSS : Login
@@ -6,12 +7,12 @@
-