diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-06-06 00:35:39 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-06-06 00:35:39 -0600 |
| commit | 7cdcb5179f6d5414c9224fb65b7b36ab69ba52da (patch) | |
| tree | ffc78236234505ca953870dc68ffb76fe0cae872 /application | |
| parent | c5425f42a4a13f7f585ffe45c070a865cdef6077 (diff) | |
| parent | 329bd8caa126040ba7abaf28e8f76e0b6739ceff (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/config.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/application/config/config.php b/application/config/config.php index 6a30d91c..d274a31b 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -23,7 +23,8 @@ * then a full URL will be used, eg: http://localhost/kohana/. If it only includes * the path, and a site_protocol is specified, the domain will be auto-detected. */ -$config["site_domain"] = dirname($_SERVER["SCRIPT_NAME"]); +$config["site_domain"] = dirname( + empty($_SERVER["ORIG_SCRIPT_NAME"]) ? $_SERVER["SCRIPT_NAME"] : $_SERVER["ORIG_SCRIPT_NAME"]); /** * Force a default protocol to be used by the site. If no site_protocol is |