Permalink
Browse files

Merge branch 'master' of git://github.com/haraldpdl/oscommerce

  • Loading branch information...
2 parents 4167d5e + 03d1c36 commit 4aa7a1499065972f83d41b354946760125268c86 @haraldpdl haraldpdl committed Mar 15, 2009
Showing with 2 additions and 2 deletions.
  1. +2 −2 admin/includes/applications/languages/classes/languages.php
@@ -712,7 +712,7 @@ public static function import($file, $type) {
'currency' => $source['language']['data']['default_currency'],
'numeric_separator_decimal' => $source['language']['data']['numerical_decimal_separator'],
'numeric_separator_thousands' => $source['language']['data']['numerical_thousands_separator'],
- 'parent_language_code' => $source['language']['data']['parent_language_code'],
+ 'parent_language_code' => (isset($source['language']['data']['parent_language_code']) ? $source['language']['data']['parent_language_code'] : ''),
'parent_id' => 0);
if ( osC_Currencies_Admin::exists($language['currency']) === false ) {
@@ -946,7 +946,7 @@ public static function import($file, $type) {
while ( $Qvalues->next() ) {
$Qinsert = $osC_Database->query('insert into :table_products_variants_values (id, languages_id, products_variants_groups_id, title, sort_order) values (:id, :languages_id, :products_variants_groups_id, :title, :sort_order)');
- $Qinsert->bindTable(':table_products_variants_groups', TABLE_PRODUCTS_VARIANTS_GROUPS);
+ $Qinsert->bindTable(':table_products_variants_values', TABLE_PRODUCTS_VARIANTS_VALUES);
$Qinsert->bindInt(':id', $Qvalues->valueInt('id'));
$Qinsert->bindInt(':languages_id', $language_id);
$Qinsert->bindInt(':products_variants_groups_id', $Qvalues->valueInt('products_variants_groups_id'));

0 comments on commit 4aa7a14

Please sign in to comment.