diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-03-31 23:53:44 +0200 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-31 23:53:44 +0200 |
| commit | 8e23148936c5aa043e7f6bfe56edc8b0f3a20b43 (patch) | |
| tree | af9d317cb72a8726443554a9f965bc849ba21ade | |
| parent | 4711943f422a2dfd047805eb088200425c2d1476 (diff) | |
| download | etherpad-8e23148936c5aa043e7f6bfe56edc8b0f3a20b43.tar.gz etherpad-8e23148936c5aa043e7f6bfe56edc8b0f3a20b43.tar.xz etherpad-8e23148936c5aa043e7f6bfe56edc8b0f3a20b43.zip | |
Revert "Change Pro Account login to HTTP instead of HTTPS"
This should ideally be done from teh config-file. Anyway, the pro-pad system needs a greater review / cleanup.
This reverts commit bb52de2259c58d36265c8af63c5c141e07ed466a.
| -rw-r--r-- | etherpad/src/etherpad/pro/pro_accounts.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etherpad/src/etherpad/pro/pro_accounts.js b/etherpad/src/etherpad/pro/pro_accounts.js index 97585a3..cdecd0d 100644 --- a/etherpad/src/etherpad/pro/pro_accounts.js +++ b/etherpad/src/etherpad/pro/pro_accounts.js @@ -512,7 +512,7 @@ function getFullNameById(id) { function getTempSigninUrl(account, tempPass) { return [ - 'http://', httpsHost(pro_utils.getFullProHost()), '/ep/account/sign-in?', + 'https://', httpsHost(pro_utils.getFullProHost()), '/ep/account/sign-in?', 'uid=', account.id, '&tp=', tempPass ].join(''); } |