--- lib/PXElator/format.pm	2009/08/13 12:06:35	213
+++ lib/PXElator/format.pm	2009/08/13 13:06:18	216
@@ -4,11 +4,13 @@
 use strict;
 
 sub mac {
-	my ( $mac, $op ) = @_;
-	$op ||= 'html';
-	$mac =~ s{(..)}{$1:}g;
-	$mac =~ s{:$}{};
-	$mac = qq|<tt>$mac</tt>| if (caller(1))[3] =~ m{^httpd} && $op ne 'clean';
+	my ($mac,$op) = @_;
+	$op ||= '';
+	if ( $mac !~ m{:} ) {
+		$mac =~ s{(..)}{$1:}g;
+		$mac =~ s{:$}{};
+	}
+	$mac = qq|<tt>$mac</tt>| if $op =~ m{htm};
 	return uc($mac);
 }