Merge branch 'admin'
Conflicts: core/lib/Thelia/Admin/Controller/BaseAdminController.php core/lib/Thelia/Config/Resources/config.xml core/lib/Thelia/Core/Template/Element/BaseLoop.php core/lib/Thelia/Core/Template/Loop/Category.php core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php core/lib/Thelia/Model/Admin.php core/lib/Thelia/Model/Customer.php
This commit is contained in:
@@ -79,4 +79,14 @@ class BaseAdminController extends ContainerAware
|
||||
|
||||
return $parser;
|
||||
}
|
||||
}
|
||||
|
||||
public function getFormFactory()
|
||||
{
|
||||
return BaseForm::getFormFactory($this->getRequest(), ConfigQuery::read("form.secret.admin", md5(__DIR__)));
|
||||
}
|
||||
|
||||
public function getFormBuilder()
|
||||
{
|
||||
return $this->getFormFactory()->createBuilder("form");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user