Merge branch 'fclose-before-unlink-updater' into 'master'

[tt-rss.git] / update.php

diff --git a/update.php b/update.php
index 54401f99acfbffd2476bb4594954b25771fa64c2..65cf9f06efbea909b923a305abf6d954dca1b020 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -325,7 +325,7 @@
                        for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
                                _debug("performing update up to version $i...");
 
-                               $result = $updater->performUpdateTo($i);
+                               $result = $updater->performUpdateTo($i, false);
 
                                _debug($result ? "OK!" : "FAILED!");
 
@@ -405,5 +405,7 @@
        PluginHost::getInstance()->run_commands($options);
 
        if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
+               if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
+                       fclose($lock_handle);
                unlink(LOCK_DIRECTORY . "/$lock_filename");
 ?>