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

2013-11-21 17:43:59 +01:00
parent 9eefcfd058 8bdc6c9a51
commit 5976a471a7
1 changed files with 6 additions and 7 deletions
@@ -27,14 +27,8 @@
 class ProductControllerCore extends FrontController
 {
 	public $php_self = 'product';
-	/**
-	 * @var Product
-	 */
-	protected $product;

-	/**
-	 * @var Category
-	 */
+	protected $product;
 	protected $category;

 	public function setMedia()
@@ -668,4 +662,9 @@ class ProductControllerCore extends FrontController
 	{
 	    return $this->product;
 	}
+	
+	public function getCategory()
+	{
+	    return $this->category;
+	}
 }