Better htmlcontent check
Merge branch 'product_class' of https://github.com/acidvertigo/oscommerce2 into product_class

Conflicts:
	catalog/includes/modules/pages/tp_product.php
Merge branch 'product_class' of https://github.com/acidvertigo/oscommerce2 into product_class