configuration.rb in tdiary-4.2.0

- old
+ new

@@ -38,18 +38,18 @@
 		def delete( key )
 			@options.delete( key )
 			@options2.delete( key )
 		end
 
-		# backword compatibility, you can use @cgi.mobile_agent?
+		# backword compatibility, returns NOT mobile phone always
 		def mobile_agent?
-			@request.mobile_agent?
+			false
 		end
 
-		# backword compatibility, you can use @cgi.smartphone?
+		# backword compatibility, returns NOT smartphone always
 		def smartphone?
-			@request.smartphone?
+			false
 		end
 		alias iphone? smartphone?
 
 		# backword compatibility, you can use bot? or @conf.bot =~ @cgi.user_agent
 		def bot?
@@ -136,10 +136,10 @@
 		# loading tdiary.conf in current directory
 		def configure_attrs
 			@secure = true unless @secure
 			@options = {}
 
-			eval( File::open( 'tdiary.conf' ) {|f| f.read }.untaint, b, "(tdiary.conf)", 1 )
+			eval( File::open( 'tdiary.conf' ) {|f| f.read }.untaint, nil, "(tdiary.conf)", 1 )
 
 			# language setup
 			@lang = 'ja' unless @lang
 			begin
 				instance_eval( File::open( "#{TDiary::PATH}/tdiary/lang/#{@lang}.rb" ){|f| f.read }.untaint, "(tdiary/lang/#{@lang}.rb)", 1 )