diff options
| author | Cash Costello <cash.costello@gmail.com> | 2013-04-13 06:58:50 -0700 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2013-04-13 06:58:50 -0700 |
| commit | 50c25a6ea62028d95390c7039d38d79a1e03abfe (patch) | |
| tree | 5b1df3a15d76e6372f54ea1f035ad8ca69be3ac6 /htaccess_dist | |
| parent | 8b53f353c5f4eb5b7c893369142882c856d3c83b (diff) | |
| parent | a4874cba03660c3c2169c71c1d32e5474304d984 (diff) | |
| download | elgg-50c25a6ea62028d95390c7039d38d79a1e03abfe.tar.gz elgg-50c25a6ea62028d95390c7039d38d79a1e03abfe.tar.bz2 | |
Merge pull request #5309 from mrclay/5230
Fixes #5297: Improve error message in cases of suspected cross-domain login
Diffstat (limited to 'htaccess_dist')
| -rw-r--r-- | htaccess_dist | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/htaccess_dist b/htaccess_dist index 898fa22fb..44d129475 100644 --- a/htaccess_dist +++ b/htaccess_dist @@ -112,6 +112,14 @@ RewriteEngine on # #RewriteBase / + +# If your users receive the message "Sorry, logging in from a different domain is not permitted" +# you must make sure your login form is served from the same hostname as your site pages. +# See http://docs.elgg.org/wiki/Login_token_mismatch_error for more info. +# +# If you must add RewriteRules to change hostname, add them directly below (above all the others) + + # In for backwards compatibility RewriteRule ^pg\/([A-Za-z0-9\_\-]+)$ engine/handlers/page_handler.php?handler=$1&%{QUERY_STRING} [L] RewriteRule ^pg\/([A-Za-z0-9\_\-]+)\/(.*)$ engine/handlers/page_handler.php?handler=$1&page=$2&%{QUERY_STRING} [L] |