Skip to content

Commit

Permalink
Merge branch 'master' of github.com:iampersistent/VespolinaCore
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard Shank committed Apr 28, 2014
2 parents f4793ce + 65bbb50 commit a154dfe
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions lib/Vespolina/Entity/Product/BaseProduct.php
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ public function getPrice($type = 'unit')
*/
public function getPrices()
{
return $this->prices;
return (array) $this->prices;
}

/**
Expand Down Expand Up @@ -620,7 +620,11 @@ public function clearTaxonomies()
*/
public function getTaxonomy($name)
{

foreach ($this->taxonomies as $taxonomy) {
if ($taxonomy->getName() == $name) {
return $taxonomy;
}
}

return null;
}
Expand Down

0 comments on commit a154dfe

Please sign in to comment.