From a91d0e4c787b98fb44bd2205073b79ad90a3f484 Mon Sep 17 00:00:00 2001 From: franck Date: Mon, 8 Jul 2013 13:39:37 +0200 Subject: [PATCH] Fixed method name --- core/lib/Thelia/Admin/Controller/BaseAdminController.php | 4 ++-- core/lib/Thelia/Core/Template/Loop/Product.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/lib/Thelia/Admin/Controller/BaseAdminController.php b/core/lib/Thelia/Admin/Controller/BaseAdminController.php index 5a4020561..7c66c430b 100755 --- a/core/lib/Thelia/Admin/Controller/BaseAdminController.php +++ b/core/lib/Thelia/Admin/Controller/BaseAdminController.php @@ -83,7 +83,7 @@ class BaseAdminController extends ContainerAware catch (AuthenticationTokenNotFoundException $ex) { // No auth token -> perform login - return new RedirectResponse($this->generateUrl('/admin/login')); + return new RedirectResponse($this->generateUrl('admin/login')); } return $data; @@ -134,7 +134,7 @@ class BaseAdminController extends ContainerAware */ public function generateUrl($route, $parameters = array(), $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH) { - return "$route"; + return "thelia2/$route"; //return $this->container->get('router')->generate($route, $parameters, $referenceType); } diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php index 2d427d6b7..acef5a27d 100755 --- a/core/lib/Thelia/Core/Template/Loop/Product.php +++ b/core/lib/Thelia/Core/Template/Loop/Product.php @@ -55,7 +55,7 @@ class Product extends BaseLoop /** * @return ArgumentCollection */ - protected function defineArgs() + protected function getArgDefinitions() { return new ArgumentCollection( Argument::createIntListTypeArgument('id'),