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

Merge branch 'master' into loops

Browse Source 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html
This commit is contained in:
Etienne Roudeix
2013-07-05 11:16:55 +02:00
parent a7a9688d41 5fbb923e40
commit 55a309c00a
670 changed files with 153101 additions and 187341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/lib/Thelia/Admin/Controller/BaseAdminController.php
View File

@@ -48,7 +48,7 @@ class BaseAdminController extends ContainerAware
*/
public function render($templateName, $args = array())
{
$args = array_merge($args, array('lang' => 'fr')); // FIXME
$args = array_merge($args, array('lang' => 'fr'));
$response = new Response();
@@ -57,7 +57,7 @@ class BaseAdminController extends ContainerAware
public function renderRaw($templateName, $args = array())
{
$args = array_merge($args, array('lang' => 'fr')); // FIXME
$args = array_merge($args, array('lang' => 'fr'));
return $this->getParser()->render($templateName, $args);
}
@@ -79,17 +79,4 @@ 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");
}
protected function isGranted() {
}
}