|
@@ -89,8 +89,8 @@ discard block |
|
|
block discarded – undo |
|
89
|
89
|
{ |
|
90
|
90
|
if (!($routeMatch = $e->getRouteMatch())) { return; }; |
|
91
|
91
|
|
|
92
|
|
- $format = $e->getRouteMatch()->getParam('format',"html"); |
|
93
|
|
- $channel = $e->getRouteMatch()->getParam('channel',"default"); |
|
|
92
|
+ $format = $e->getRouteMatch()->getParam('format', "html"); |
|
|
93
|
+ $channel = $e->getRouteMatch()->getParam('channel', "default"); |
|
94
|
94
|
|
|
95
|
95
|
if ('xml' == $format) { |
|
96
|
96
|
$viewModel = $e->getResult(); |
|
@@ -99,8 +99,8 @@ discard block |
|
|
block discarded – undo |
|
99
|
99
|
} |
|
100
|
100
|
$resolver = $e->getApplication()->getServiceManager()->get('ViewResolver'); |
|
101
|
101
|
|
|
102
|
|
- $templateDefault = $viewModel->getTemplate() . '.xml.phtml'; |
|
103
|
|
- $templateChannel = $viewModel->getTemplate() . '.' . $channel . '.xml.phtml'; |
|
|
102
|
+ $templateDefault = $viewModel->getTemplate().'.xml.phtml'; |
|
|
103
|
+ $templateChannel = $viewModel->getTemplate().'.'.$channel.'.xml.phtml'; |
|
104
|
104
|
|
|
105
|
105
|
|
|
106
|
106
|
if ($channel != 'default' && $resolver->resolve($templateChannel)) { |
|
@@ -117,7 +117,7 @@ discard block |
|
|
block discarded – undo |
|
117
|
117
|
|
|
118
|
118
|
/* @var Response $response */ |
|
119
|
119
|
$response = $e->getResponse(); |
|
120
|
|
- $response->getHeaders()->addHeaderLine('Content-Type','application/xml'); |
|
|
120
|
+ $response->getHeaders()->addHeaderLine('Content-Type', 'application/xml'); |
|
121
|
121
|
} |
|
122
|
122
|
|
|
123
|
123
|
} |
Please login to merge, or discard this patch.