summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-08-17 22:32:47 -0700
committerBharat Mediratta <bharat@menalto.com>2010-08-17 22:32:47 -0700
commit387d30da764b152a9bb40ac6db7d9ce5282aa7a3 (patch)
tree1aa5d3fcaf4434d6ba9bfa2dd8f1d38903b7f4b6
parentff1d8aea2f2805f85ce3cc7e4079d04fb9f1bac4 (diff)
use HTTP_HOST instead of SERVER_NAME so that we're sending requests
back to the same canonical domain that we came from. Else Flash makes crossdomain.xml requests, fails, and falls over. Fixes ticket #1298.
-rw-r--r--modules/organize/controllers/organize.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 3005eb67..7b2ba8ef 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -38,7 +38,7 @@ class Organize_Controller extends Controller {
$v = new View("organize_dialog.html");
$v->album = $album;
- $v->domain = $input->server("SERVER_NAME");
+ $v->domain = $input->server("HTTP_HOST");
$v->access_key = rest::access_key();
$v->file_filter = addslashes($file_filter);
$v->sort_order = addslashes(json_encode($sort_order));