diff options
| author | Robin Houston <robin@lenny.robin> | 2011-06-13 19:19:04 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-06-13 19:19:04 +0100 |
| commit | f48753e48a68d1ca0be97e5a740a11583c39b361 (patch) | |
| tree | 7334c1a10378b79785ac6208101bc23356166614 | |
| parent | f9ea41f6cbfc191f8bd549531b3e6dd7c964762e (diff) | |
Change the default value of ADMIN_PUBLIC_URL from "/" to "", because absolute paths are not allowed (i.e. do not work)
| -rw-r--r-- | config/environment.rb | 2 | ||||
| -rw-r--r-- | config/general-example | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/environment.rb b/config/environment.rb index 732be8d07..80f0f144a 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -108,7 +108,7 @@ ActionMailer::Base.default_url_options[:host] = MySociety::Config.get("DOMAIN", if (MySociety::Config.get("DOMAIN", "") != "") ActionController::Base.asset_host = Proc.new { |source, request| if request.fullpath.match(/^\/admin\//) - MySociety::Config.get("ADMIN_PUBLIC_URL", "/") + MySociety::Config.get("ADMIN_PUBLIC_URL", "") else MySociety::Config.get("DOMAIN", 'localhost:3000') end diff --git a/config/general-example b/config/general-example index 29f29ca8d..df27596ea 100644 --- a/config/general-example +++ b/config/general-example @@ -39,8 +39,8 @@ define('OPTION_BLACKHOLE_PREFIX', 'do-not-reply-to-this-address'); // used as en define('OPTION_CONTACT_EMAIL', 'admin@localhost'); define('OPTION_ADMIN_BASE_URL', '/admin/'); // Where /stylesheets sits under for admin pages. See asset_host in -// config/environment.rb. Can be full domain or relative path. -define('OPTION_ADMIN_PUBLIC_URL', '/'); +// config/environment.rb. Can be full domain or relative path (not an absolute path beginning with /). +define('OPTION_ADMIN_PUBLIC_URL', ''); // Secret key for signing cookie_store sessions define('OPTION_COOKIE_STORE_SESSION_SECRET', 'your secret key here, make it long and random'); |