Merge branch 'admin' of https://github.com/thelia/thelia into admin

2013-07-02 15:54:24 +02:00
parent b54fec5243 32da874ba1
commit b20c44b12b
7 changed files with 81 additions and 46 deletions
--- a/core/lib/Thelia/Admin/Controller/AdminController.php
+++ b/core/lib/Thelia/Admin/Controller/AdminController.php
@@ -65,11 +65,9 @@ class AdminController extends BaseAdminController {

    protected function getLoginForm()
    {
-        $form = $this->getFormBuilder();
+        $adminLogin = new AdminLogin($this->getRequest());

-        $adminLogin = new AdminLogin();
-
-        return $adminLogin->buildForm($form, array())->getForm();
+        return $adminLogin->getForm();
    }

    public function lostAction()