00default.rb in tdiary-4.1.2

- old
+ new

@@ -340,16 +340,17 @@
 		end
 	else
 		uri = @conf.index.dup
 		uri[0, 0] = base_url if %r|^https?://|i !~ @conf.index
 		uri.gsub!( %r|/\./|, '/' )
+		image = File.join(uri, "#{theme_url}/ogimage.png")
 		if @mode == 'day' then
 			uri += anchor( @date.strftime( '%Y%m%d' ) )
 		end
 		%Q[<meta content="#{title_tag.gsub(/<[^>]*>/, "")}" property="og:title">
 		<meta content="#{(@mode == 'day') ? 'article' : 'website'}" property="og:type">
-		<meta content="#{h uri}#{h theme_url}/ogimage.png" property="og:image">
+		<meta content="#{h image}" property="og:image">
 		<meta content="#{h uri}" property="og:url">]
 	end
 end
 
 def description_tag
@@ -381,11 +382,11 @@
 
 def script_tag
 	require 'uri'
 	query = script_tag_query_string
 	html = @javascripts.sort.map {|script|
-		if URI(script).scheme
+		if URI(script).scheme or script =~ %r|\A//|
 			%Q|<script src="#{script}" type="text/javascript"></script>|
 		else
 			%Q|<script src="#{js_url}/#{script}#{query}" type="text/javascript"></script>|
 		end
 	}.join( "\n\t" )
@@ -999,10 +1000,10 @@
 
 #
 # old ruby alert
 #
 def old_ruby_alert
-	if RUBY_VERSION < '1.9' and !@conf['old_ruby_alert.hide']
+	if RUBY_VERSION < '2.0.0' and !@conf['old_ruby_alert.hide']
 		%Q|<div class="alert-warn">
 			<a href="#" class="action-button" id="alert-old-ruby">&times;</a>
 			#{old_ruby_alert_message}
 		</div>|
 	else