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

2013-09-06 16:15:04 +02:00
parent 3ac3224e1c 1d231dc11b
commit ab134f872c
42 changed files with 1518 additions and 700 deletions
--- a/core/lib/Thelia/Controller/BaseController.php
+++ b/core/lib/Thelia/Controller/BaseController.php
@@ -226,7 +226,7 @@ class BaseController extends ContainerAware
        $route = $this->container->get($routerName)->getRouteCollection()->get($routeId);

        if ($route == null) {
-            throw new InvalidArgumentException(sprintf("Route ID '%s' does not exists.", $routeId));
+            throw new \InvalidArgumentException(sprintf("Route ID '%s' does not exists.", $routeId));
        }

        return $route->getPath();