[-] Class: Carrier / move query in if statement
Merge pull request #1980 from PrestaEdit/patch-76

[*] Class: Carrier / move query in if statement