Merge branch 'g5'

This commit is contained in:
chicpro
2014-08-20 10:30:23 +09:00

View File

@ -2607,11 +2607,11 @@ function print_address($addr1, $addr2, $addr3, $addr4)
} else {
if($addr2)
$address .= ', '.$addr2;
if($addr3)
$address .= ' '.$addr3;
}
if($addr3)
$address .= ' '.$addr3;
return $address;
}