dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// test git

Browse Source 
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	controllers/admin/AdminImportController.php
This commit is contained in:
Kevin Granger committed 2013-11-28 14:29:34 +01:00
2 parents 8f5bac0e90 cb9d00352f
commit 8848ff08d8
2 files changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+1
View File
@@ -146,6 +146,7 @@
$('#csv_file_uploader').hide(); $('#csv_file_uploader').hide();
$('#csv_files_history').hide(); $('#csv_files_history').hide();
} }
function csv_unselect() { function csv_unselect() {
$('#csv_file_selected').hide(); $('#csv_file_selected').hide();
$('#csv_file_uploader').show(); $('#csv_file_uploader').show();
controllers/admin/AdminImportController.php
+1 -1
View File
@@ -540,7 +540,7 @@ class AdminImportControllerCore extends AdminController
$entity_selected = (int)$this->context->cookie->entity_selected; $entity_selected = (int)$this->context->cookie->entity_selected;
$csv_selected = ''; $csv_selected = '';
if (isset($this->context->cookie->csv_selected) && file_exists(_PS_ADMIN_DIR_.'/import/'.$this->context->cookie->csv_selected)) if (isset($this->context->cookie->csv_selected) && file_exists(_PS_ADMIN_DIR_.'/import/'.base64_decode($this->context->cookie->csv_selected)))
$csv_selected = base64_decode($this->context->cookie->csv_selected); $csv_selected = base64_decode($this->context->cookie->csv_selected);
else else
$this->context->cookie->csv_selected = $csv_selected; $this->context->cookie->csv_selected = $csv_selected;