diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-04-08 18:44:02 +0200 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-04-08 18:44:02 +0200 |
| commit | 88598d0aaf70671800ece83f9831bbdd9c6eb3be (patch) | |
| tree | c7510affb0ebbcac42efba20ca0d4950667b3427 | |
| parent | 698aa618998886d16bc4087d5d82a30f889ef560 (diff) | |
| parent | 51ce3c009aafede360887f317797b19444f7717f (diff) | |
| download | etherpad-88598d0aaf70671800ece83f9831bbdd9c6eb3be.tar.gz etherpad-88598d0aaf70671800ece83f9831bbdd9c6eb3be.tar.xz etherpad-88598d0aaf70671800ece83f9831bbdd9c6eb3be.zip | |
Merge branch 'master' of git@github.com:ether/pad
| -rw-r--r-- | etherpad/etc/etherpad.localdev-default.properties | 2 | ||||
| -rw-r--r-- | etherpad/src/etherpad/pro/pro_utils.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties index 07dce96..98327fd 100644 --- a/etherpad/etc/etherpad.localdev-default.properties +++ b/etherpad/etc/etherpad.localdev-default.properties @@ -15,7 +15,7 @@ listen = 9000 logDir = ./data/logs modulePath = ./src motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0 -topdomains = localhost +topdomains = localhost,localbox.info transportPrefix = /comet transportUseWildcardSubdomains = true useHttpsUrls = false diff --git a/etherpad/src/etherpad/pro/pro_utils.js b/etherpad/src/etherpad/pro/pro_utils.js index 2322262..1198b95 100644 --- a/etherpad/src/etherpad/pro/pro_utils.js +++ b/etherpad/src/etherpad/pro/pro_utils.js @@ -49,7 +49,7 @@ function getRequestSuperdomain() { var parts = request.domain.split('.'); while (parts.length > 0) { var domain = parts.join('.'); - if (domainEnabled[domain]) { + if (domainEnabled(domain)) { return domain; } parts.shift(); |