Make the conditional correct for print_prefix

Fixes a bug introduced on #1936.
2013-06-11 16:14:03 -05:00 · 2013-06-11 16:14:03 -05:00 · 6a5d1d06b2
parent d7e3c5cdb3
commit 6a5d1d06b2
1 changed files with 2 additions and 3 deletions
--- a/lib/msf/core/module.rb
+++ b/lib/msf/core/module.rb
@ -179,9 +179,8 @@ class Module
 	#

 	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")}] "