TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source 
Conflicts:
	templates/admin/default/categories.html
	templates/admin/default/includes/add-category-dialog.html
	templates/admin/default/includes/delete-category-dialog.html
This commit is contained in:
franck
2013-09-06 16:18:54 +02:00
parent 6fdf60b960 ebb350111a
commit 8bd7a6413d
27 changed files with 851 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php
View File

@@ -24,7 +24,7 @@
namespace Thelia\Core\Event;
use Thelia\Model\Category;
class CategoryToggleVisibilityEvent extends ActionEvent
class CategoryToggleVisibilityEvent extends CategoryEvent
{
protected $category_id;
protected $category;