valid url is returned even if script_name is empty. #180

tdiary · Jun 23, 2012 · 3667380 · 3667380
1 parent fbd355a
commit 3667380
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/tdiary/config.rb b/tdiary/config.rb
@@ -64,14 +64,15 @@ def base_url
 		end
 
 		def base_url_auto
-			return '' if @cgi.script_name.nil? || @cgi.script_name.empty?
+			return '' unless @cgi.script_name
 			begin
+				script_dirname = @cgi.script_name.empty? ? '' : File::dirname(@cgi.script_name)
 				if @cgi.https?
 					port = (@cgi.server_port == 443) ? '' : ':' + @cgi.server_port.to_s
-					"https://#{ @cgi.server_name }#{ port }#{File::dirname(@cgi.script_name)}/"
+					"https://#{ @cgi.server_name }#{ port }#{script_dirname}/"
 				else
 					port = (@cgi.server_port == 80) ? '' : ':' + @cgi.server_port.to_s
-					"http://#{ @cgi.server_name }#{ port }#{File::dirname(@cgi.script_name)}/"
+					"http://#{ @cgi.server_name }#{ port }#{script_dirname}/"
 				end.sub(%r|/+$|, '/')
 			rescue SecurityError
 				''