SELECT * FROM `artikli` WHERE `id`!='0' AND `aktivan`='on' AND `prikaz_shop`='on' AND category_id IN ('2') AND stock>0
UNION
SELECT * FROM `artikli` WHERE `id`!='0' AND `aktivan`='on' AND `prikaz_shop`='on' AND category_id IN ('2') AND vodi_se_zaliha=''
ORDER BY `id` DESC LIMIT 0,24
