summaryrefslogtreecommitdiffstats
path: root/etherpad/src/main.js
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2010-04-05 19:37:52 +0200
committerEgil Moeller <egil.moller@freecode.no>2010-04-05 19:37:52 +0200
commit180dbf215a65c924be4801b159db263d85c58d07 (patch)
tree610f5675e50b5373a525ec6ebe9f9d9a2a1f9378 /etherpad/src/main.js
parentceaf334e40ea01d58a5ace5417b9c6df78fe31e8 (diff)
parenta057a37ce3ec2621fbfaadaea083aef0bd5180cc (diff)
downloadetherpad-180dbf215a65c924be4801b159db263d85c58d07.tar.gz
etherpad-180dbf215a65c924be4801b159db263d85c58d07.tar.bz2
etherpad-180dbf215a65c924be4801b159db263d85c58d07.zip
Merge branch 'master' of git://github.com/cjb/pad
Diffstat (limited to 'etherpad/src/main.js')
-rw-r--r--etherpad/src/main.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/etherpad/src/main.js b/etherpad/src/main.js
index 2d92a1a..6faa71a 100644
--- a/etherpad/src/main.js
+++ b/etherpad/src/main.js
@@ -258,7 +258,8 @@ function checkRequestIsWellFormed() {
// checkHost()
//----------------------------------------------------------------
function checkHost() {
- if (appjet.config['etherpad.skipHostnameCheck'] == "true") {
+ var trueRegex = /\s*true\s*/i;
+ if (trueRegex.test(appjet.config['etherpad.skipHostnameCheck'])) {
return;
}