Land rapid7#1942

egypt · egypt · commit 760115264049 · 2013-06-11T16:29:19.000-05:00
diff --git a/lib/msf/core/module.rb b/lib/msf/core/module.rb
@@ -179,9 +179,8 @@ def replicant
 	#
 
 	def print_prefix
-		if framework && (
-			datastore['TimestampOutput'] =~ /^(t|y|1)/i or
-			framework.datastore['TimestampOutput'] =~ /^(t|y|1)/i
+		if (datastore['TimestampOutput'] =~ /^(t|y|1)/i) || (
+			framework && framework.datastore['TimestampOutput'] =~ /^(t|y|1)/i
 		)
 			prefix = "[#{Time.now.strftime("%Y.%m.%d-%H:%M:%S")}] "
 

Original file line number	Diff line number	Diff line change
`@@ -179,9 +179,8 @@ def replicant`
`179`	`179`	`#`
`180`	`180`
`181`	`181`	`def print_prefix`
`182`		`- if framework && (`
`183`		`- datastore['TimestampOutput'] =~ /^(t\|y\|1)/i or`
`184`		`- framework.datastore['TimestampOutput'] =~ /^(t\|y\|1)/i`
	`182`	`+ if (datastore['TimestampOutput'] =~ /^(t\|y\|1)/i) \|\| (`
	`183`	`+ framework && framework.datastore['TimestampOutput'] =~ /^(t\|y\|1)/i`
`185`	`184`	`)`
`186`	`185`	`prefix = "[#{Time.now.strftime("%Y.%m.%d-%H:%M:%S")}] "`
`187`	`186`