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

2013-02-15 17:26:06 +01:00
parent 804f88ec23 15f8b1a19f
commit 319ccf4e9e
1 changed files with 3 additions and 1 deletions
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -589,7 +589,9 @@ class AdminControllerCore extends Controller
 		{
 			$content[$i] = array();
 			foreach ($this->fields_list as $key => $value)
-				$content[$i][] = $row[$key];
+				if (isset($row[$key]))
+					$content[$i][] = $row[$key];
+				
 		}
 		$this->context->smarty->assign(array(
 			'export_headers' => $headers,