mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-20 15:36:16 -04:00
Merge pull request #3187 from tiblu/ep_prefs_different_cookie_for_different_protocol
#3179 - Using EP on same domain, but over different protocols causes "Warning: it appears that your browser does not have cookies enabled.
This commit is contained in:
commit
f6456c0aa7
2 changed files with 8 additions and 3 deletions
|
@ -459,7 +459,7 @@ var pad = {
|
|||
// This will check if the prefs-cookie is set.
|
||||
// Otherwise it shows up a message to the user.
|
||||
padcookie.init();
|
||||
if (!readCookie("prefs"))
|
||||
if (!padcookie.isCookiesEnabled())
|
||||
{
|
||||
$('#loading').hide();
|
||||
$('#noCookie').show();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue