Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-04-08 19:02:00 +0300
committerMorris Jobke <hey@morrisjobke.de>2015-04-08 19:02:00 +0300
commit78ec7543d50ff3ab269e4d668730405841038c6b (patch)
treea4bb7a5418c068ba9a59a31b72e01b97ad20d373
parentfc2711e15695f0be8e353a0237e5f1f5b5dc4389 (diff)
Fix maintenance refresh interval
* fix XMLHttpRequest - send after callback is registered * check for correct type of value - it's a boolean * return correct content-type in status.php
-rw-r--r--core/js/maintenance-check.js4
-rw-r--r--status.php1
2 files changed, 3 insertions, 2 deletions
diff --git a/core/js/maintenance-check.js b/core/js/maintenance-check.js
index 8ca00456fef..061a434214b 100644
--- a/core/js/maintenance-check.js
+++ b/core/js/maintenance-check.js
@@ -7,14 +7,14 @@ function checkStatus() {
0, location.pathname.indexOf('index.php')
);
request.open("GET", ocroot+'status.php', true);
- request.send();
request.onreadystatechange = function() {
if (request.readyState === 4) {
var response = request.responseText;
var responseobj = JSON.parse(response);
- if (responseobj.maintenance === 'false') {
+ if (responseobj.maintenance === false) {
window.location.reload();
}
}
};
+ request.send();
}
diff --git a/status.php b/status.php
index 1628e824e00..6e7bcea5266 100644
--- a/status.php
+++ b/status.php
@@ -41,6 +41,7 @@ try {
if (OC::$CLI) {
print_r($values);
} else {
+ header('Content-Type: application/json');
echo json_encode($values);
}