Originally Posted by
nohart
I did it! I used Beyond Compare and let it merge the file from Fual Slimbox (left side) & From Image Handler3 (right side)for me but it didnt work. So I went back and looked at the individual conflict lines and changed one line at around 82-84 (respectively) that read:
$products_image_large = ereg_replace('^' . DIR_WS_IMAGES, DIR_WS_IMAGES . 'large/', $products_image_directory) . ereg_replace($file_extension . '$', '', $file) . IMAGE_SUFFIX_LARGE . $file_extension;
and switched it to this line:
$products_image_large = str_replace(DIR_WS_IMAGES, DIR_WS_IMAGES . 'large/', $products_image_directory) . str_replace($products_image_extension, '', $file) . IMAGE_SUFFIX_LARGE . $products_image_extension;
Saved the new file as additional_images.php and now its working again like it used to!
Located here:
/public_html/includes/modules/your template
Woo hoo my first file merge!
Bookmarks