Skip to content

Commit

Permalink
remove unneeded array_merge calls
Browse files Browse the repository at this point in the history 
all 'product_*' keys are non existent in $data since it's a product table only query result row. I removed those calls more then 2 years ago in my code. array_merge is used for merging values for existing keys.

No point in initializing $data to an array and then overwriting it in the next line. btw, $query->row is always an array (at least an empty array)

(Techically, there is no need here to left join to product_description in the query either other then to ensure the product has a valid description)
  • Loading branch information
maks feltrin committed Apr 3, 2015
1 parent 8559919 commit a7d4042
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions upload/admin/model/catalog/product.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,6 @@ public function copyProduct($product_id) {
$query = $this->db->query("SELECT DISTINCT * FROM " . DB_PREFIX . "product p LEFT JOIN " . DB_PREFIX . "product_description pd ON (p.product_id = pd.product_id) WHERE p.product_id = '" . (int)$product_id . "' AND pd.language_id = '" . (int)$this->config->get('config_language_id') . "'");

if ($query->num_rows) {
$data = array();

$data = $query->row;

$data['sku'] = '';
Expand All @@ -292,20 +290,20 @@ public function copyProduct($product_id) {
$data['keyword'] = '';
$data['status'] = '0';

$data = array_merge($data, array('product_attribute' => $this->getProductAttributes($product_id)));
$data = array_merge($data, array('product_description' => $this->getProductDescriptions($product_id)));
$data = array_merge($data, array('product_discount' => $this->getProductDiscounts($product_id)));
$data = array_merge($data, array('product_filter' => $this->getProductFilters($product_id)));
$data = array_merge($data, array('product_image' => $this->getProductImages($product_id)));
$data = array_merge($data, array('product_option' => $this->getProductOptions($product_id)));
$data = array_merge($data, array('product_related' => $this->getProductRelated($product_id)));
$data = array_merge($data, array('product_reward' => $this->getProductRewards($product_id)));
$data = array_merge($data, array('product_special' => $this->getProductSpecials($product_id)));
$data = array_merge($data, array('product_category' => $this->getProductCategories($product_id)));
$data = array_merge($data, array('product_download' => $this->getProductDownloads($product_id)));
$data = array_merge($data, array('product_layout' => $this->getProductLayouts($product_id)));
$data = array_merge($data, array('product_store' => $this->getProductStores($product_id)));
$data = array_merge($data, array('product_recurrings' => $this->getRecurrings($product_id)));
$data['product_attribute'] = $this->getProductAttributes($product_id)));
$data['product_description'] = $this->getProductDescriptions($product_id)));
$data['product_discount'] = $this->getProductDiscounts($product_id)));
$data['product_filter'] = $this->getProductFilters($product_id)));
$data['product_image'] = $this->getProductImages($product_id)));
$data['product_option'] = $this->getProductOptions($product_id)));
$data['product_related'] = $this->getProductRelated($product_id)));
$data['product_reward'] = $this->getProductRewards($product_id)));
$data['product_special'] = $this->getProductSpecials($product_id)));
$data['product_category'] = $this->getProductCategories($product_id)));
$data['product_download'] = $this->getProductDownloads($product_id)));
$data['product_layout'] = $this->getProductLayouts($product_id)));
$data['product_store'] = $this->getProductStores($product_id)));
$data['product_recurrings'] => $this->getRecurrings($product_id)));

$this->addProduct($data);
}
Expand Down

1 comment on commit a7d4042

@mrg123
Copy link

@mrg123 mrg123 commented on a7d4042 Jun 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$data['product_recurrings'] => $this->getRecurrings($product_id)));
too much ));
and last one =>

Please sign in to comment.