lib/tdiary/plugin/00default.rb in tdiary-5.0.7 vs lib/tdiary/plugin/00default.rb in tdiary-5.0.8

- old
+ new

@@ -354,11 +354,11 @@ '' end end def jquery_tag - %Q[<script src="//ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script>] + %Q[<script src="//ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>] end enable_js( '00default.js', async: false ) add_js_setting( '$tDiary.style', "'#{@conf.style.downcase.sub( /\Ablog/, '' )}'" ) @@ -713,12 +713,11 @@ begin rmail = File::open( "#{TDiary::PATH}/../views/mail.rtxt.#{@conf.lang}" ){|f| f.read } rescue rmail = File::open( "#{TDiary::PATH}/../views/mail.rtxt" ){|f| f.read } end - text = @conf.to_mail( ERB::new( rmail.untaint ).result( binding ) ) - receivers.each(&:untaint) + text = @conf.to_mail( ERB::new( rmail ).result( binding ) ) comment_mail( text, receivers ) end def comment_mail( text ) # no action in default. @@ -819,10 +818,10 @@ end def theme_list_local(list) Dir::glob( theme_paths_local ).sort.map {|dir| theme = dir.sub( %r[.*/theme/], '') - next unless FileTest::file?( "#{dir}/#{theme}.css".untaint ) + next unless FileTest::file?( "#{dir}/#{theme}.css" ) name = theme.split( /_/ ).collect{|s| s.capitalize}.join( ' ' ) list << ["local/#{theme}",name] } list end