Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

This commit is contained in:
Rémi Gaillard committed 2013-02-15 17:26:06 +01:00
commit 319ccf4e9e
1 file changed
+2
+2
View File
@@ -589,7 +589,9 @@ class AdminControllerCore extends Controller
{ {
$content[$i] = array(); $content[$i] = array();
foreach ($this->fields_list as $key => $value) foreach ($this->fields_list as $key => $value)
if (isset($row[$key]))
$content[$i][] = $row[$key]; $content[$i][] = $row[$key];
} }
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'export_headers' => $headers, 'export_headers' => $headers,