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

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

Browse Source 
# By Etienne Roudeix
# Via Etienne Roudeix
* 'master' of https://github.com/thelia/thelia:
  fix URL::retrieve
  global outputs in loops
This commit is contained in:
gmorel
2013-09-04 15:45:19 +02:00
parent 62c1a59f68 b910b0af86
commit a461420c67
35 changed files with 203 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/lib/Thelia/Action/PageNotFound.php
View File

@@ -27,6 +27,7 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\KernelEvents;
use Thelia\Model\ConfigQuery;
@@ -40,7 +41,7 @@ class PageNotFound extends BaseAction implements EventSubscriberInterface
{
public function display404(GetResponseForExceptionEvent $event)
{
if(is_a($event->getException(), 'Symfony\Component\HttpKernel\Exception\NotFoundHttpException')) {
if($event->getException() instanceof NotFoundHttpException) {
$parser = $this->container->get("thelia.parser");