diff --git a/admin/easypopulate_4.php b/admin/easypopulate_4.php
index 200a51c..bd0a40f 100644
--- a/admin/easypopulate_4.php
+++ b/admin/easypopulate_4.php
@@ -1,5 +1,5 @@
" . zen_draw_form('delete_form', basename($_SERVER['SCRIPT_NAME']), /*$parameters = */'', 'post', /*$params =*/ '', $request_type == 'SSL') . zen_draw_hidden_field('delete', urlencode($files[$val[$i]]), /*$parameters = */'') . zen_draw_input_field('delete_button', EASYPOPULATE_4_DISPLAY_EXPORT_FILE_DELETE, /*$parameters = */'', /*$required = */false, /*$type = */'submit') . "";
/* echo "| " . EASYPOPULATE_4_DISPLAY_EXPORT_FILE_DELETE . " | ";*/
- echo "" . EASYPOPULATE_4_DISPLAY_EXPORT_FILE_DOWNLOAD . " | \n";
+ echo "" . EASYPOPULATE_4_DISPLAY_EXPORT_FILE_DOWNLOAD . " | \n";
} else {
echo " | \n";
echo " | \n";
// echo "" . EASYPOPULATE_4_DISPLAY_EXPORT_FILE_DELETE . " | ";
echo "" . zen_draw_form('delete_form', basename($_SERVER['SCRIPT_NAME']), /*$parameters = */'', 'post', /*$params =*/ '', $request_type == 'SSL') . zen_draw_hidden_field('delete', urlencode($files[$val[$i]]), /*$parameters = */'') . zen_draw_input_field('delete_button', EASYPOPULATE_4_DISPLAY_EXPORT_FILE_DELETE, /*$parameters = */'', /*$required = */false, /*$type = */'submit') . " | ";
- echo "" . EASYPOPULATE_4_DISPLAY_EXPORT_FILE_DOWNLOAD . " | \n";
+ echo "" . EASYPOPULATE_4_DISPLAY_EXPORT_FILE_DOWNLOAD . " | \n";
}
}
} // End loop within a filetype
diff --git a/admin/easypopulate_4_import.php b/admin/easypopulate_4_import.php
index 79ec804..ed29d1f 100644
--- a/admin/easypopulate_4_import.php
+++ b/admin/easypopulate_4_import.php
@@ -1,5 +1,5 @@
notify('EP4_IMPORT_FILE_PRODUCTS_DESCRIPTION_ADD_OR_CHANGE_DATA');
- if (isset($v_products_name) || isset($v_products_description) || ($ep_supported_mods['psd'] == true && isset($v_products_short_desc) ) || isset($v_products_url) || $add_products_description_data) { //
+ if ((isset($v_products_name) && is_array($v_products_name)) || (isset($v_products_description) && is_array
+ ($v_products_description)) ||
+ ($ep_supported_mods['psd'] == true
+ &&
+ isset
+ ($v_products_short_desc) ) || (isset($v_products_url) && is_array($v_products_url)) ||
+ $add_products_description_data) { //
// Effectively need a way to step through all language options, this section to be "accepted" if there is something to be updated. Prefer the ability to verify update need without having to loop on anything, but just by "presence" of information.
foreach ($langcode as $lang) {
// foreach ($v_products_name as $key => $name) { // Decouple the dependency on the products_name being imported to update the products_name, description, short description and/or URL. //mc12345678 2015-Dec-12
@@ -1987,7 +1993,8 @@
$sql .= ($update_count ? ", " : "") . " products_url = :v_products_url: ";
$update_count = true;
}
-
+ // If using this notifier to add to the $sql, the when something is added be sure to
+ // set $update_count = true;
$zco_notifier->notify('EP4_IMPORT_FILE_PRODUCTS_DESCRIPTION_UPDATE_FIELDS_VALUES');
$sql .= " WHERE products_id = :v_products_id: AND language_id = :language_id:";
@@ -2003,10 +2010,14 @@
$sql = $db->bindVars($sql, ':language_id:', $lang_id, 'integer');
$zco_notifier->notify('EP4_IMPORT_FILE_PRODUCTS_DESCRIPTION_FIELDS_BIND_END');
- $result = ep_4_query($sql);
- if ($result) {
- zen_record_admin_activity('Updated product ' . (int) $v_products_id . ' description via EP4.', 'info');
- }
+ // Be sure to run the update query only if there has been something provded to
+ // update.
+ if ($update_count == true) {
+ $result = ep_4_query($sql);
+ if ($result) {
+ zen_record_admin_activity('Updated product ' . (int)$v_products_id . ' description via EP4.', 'info');
+ }
+ } // Perform query if there is something to update.
} // END: already in description, update it
} // END: foreach on languages
} // END: Products Descriptions End
diff --git a/changelog.txt b/changelog.txt
index cd449c1..e4cb469 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -283,3 +283,12 @@
https://www.zen-cart.com/downloads.php?do=file&id=2069
4.0.34 03/19/2016 After report of an issue with EP4.0.33 being used on ZC 1.5.5, a change was made to how paths are
generated for admin side related code.
+ On import of priceqty files, the absence of language designated fields
+ now that the products description section has been rewritten
+ would cause a sql error on update. This has been resolved.
+4.0.34.a 04/02/2016 Apply correction to importing on category information. An attempt was previously made to centralize
+ the use of the delimiter between categories. The technical reason for this not working as
+ expected was that the multi-byte function that acts on the data required the delimiter to
+ be properly formatted regex type expression. The UTF-8 version of the character was not
+ properly formatted and no further action was taken on the variable (until now). This restores
+ EP4 to its full functionality before attempting to make that improvement.