Committer: vsukhanov
LJSUP-6695: Additional development of the System message.U trunk/cgi-bin/LJ/SiteMessages.pm
Modified: trunk/cgi-bin/LJ/SiteMessages.pm =================================================================== --- trunk/cgi-bin/LJ/SiteMessages.pm 2010-09-01 04:35:49 UTC (rev 17246) +++ trunk/cgi-bin/LJ/SiteMessages.pm 2010-09-01 09:33:27 UTC (rev 17247) @@ -176,7 +176,8 @@ my @messages = $class->load_messages; @messages = grep { ref $_ } @messages; - my $office_only = LJ::GeoLocation->get_country_info_by_ip(LJ::get_remote_ip(), { allow_spec_country => 1 } ) eq '1S'; + my $country = LJ::GeoLocation->get_country_info_by_ip(LJ::get_remote_ip(), { allow_spec_country => 1 } ); + my $office_only = $country eq '1S' || $country eq '6A'; # +0 is important for doing integer bitwise operation, opposite to string operation @messages = grep { ~($_->{accounts}+0) & AccountMask->{OfficeOnly} or $office_only } @messages;