@@ -28,7 +28,6 @@ |
||
28 | 28 | use Eccube\Entity\Master\DeviceType; |
29 | 29 | use Eccube\Util\Str; |
30 | 30 | use Symfony\Component\Filesystem\Filesystem; |
31 | -use Symfony\Component\Finder\Finder; |
|
32 | 31 | use Symfony\Component\Form\FormError; |
33 | 32 | use Symfony\Component\HttpFoundation\Request; |
34 | 33 | use Symfony\Component\HttpFoundation\Response; |
@@ -26,7 +26,6 @@ |
||
26 | 26 | |
27 | 27 | use Eccube\Common\Constant; |
28 | 28 | use Eccube\Util\EntityUtil; |
29 | -use Symfony\Component\Form\FormFactory; |
|
30 | 29 | use Symfony\Component\HttpFoundation\Request; |
31 | 30 | |
32 | 31 | class CsvExportService |
@@ -23,8 +23,6 @@ |
||
23 | 23 | |
24 | 24 | namespace Eccube\Service; |
25 | 25 | |
26 | -use Eccube\Application; |
|
27 | - |
|
28 | 26 | |
29 | 27 | /** |
30 | 28 | * Copyright (C) 2012-2014 David de Boer <[email protected]> |
@@ -36,7 +36,6 @@ |
||
36 | 36 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
37 | 37 | use Symfony\Component\Routing\Exception\RouteNotFoundException; |
38 | 38 | use Symfony\Component\Validator\Constraints as Assert; |
39 | -use Symfony\Component\Form\FormError; |
|
40 | 39 | |
41 | 40 | class PluginController extends AbstractController |
42 | 41 | { |
@@ -1117,14 +1117,4 @@ |
||
1117 | 1117 | )); |
1118 | 1118 | |
1119 | 1119 | if ($response->isNotModified($request)) { |
1120 | - return $response; |
|
1121 | - } |
|
1122 | - } |
|
1123 | - } |
|
1124 | - } |
|
1125 | - |
|
1126 | - }, -1024); |
|
1127 | - |
|
1128 | ->>>>>>> k-yamamura/feature-httpcache |
|
1129 | - } |
|
1130 | -} |
|
1120 | + return $response |
|
1131 | 1121 | \ No newline at end of file |