Merge branch 'release_15.07' into dev

galaxyproject · Jul 24, 2015 · 486ba9f · 486ba9f
2 parents 898ff31 + 784e07c
commit 486ba9f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/galaxy/web/framework/base.py b/lib/galaxy/web/framework/base.py
@@ -353,7 +353,7 @@ def base( self ):
 
     @lazy_property
     def path( self ):
-        return self.environ['SCRIPT_NAME'] + self.environ['PATH_INFO']
+        return self.environ.get('SCRIPT_NAME', '') + self.environ['PATH_INFO']
 
     @lazy_property
     def browser_url( self ):