Skip to content

Commit

Permalink
Fixed 404 headers. REF: opencart#1620
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesallsup @zilgrg
jamesallsup authored and zilgrg committed Oct 1, 2014
1 parent 0ee2aa0 commit 570ae9c
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Fixed issue in Amazon Payments where tax lines where passed as products if cart had different tax rates.
* Fixed the implementation of captchas.
* Incorrect file type when uploading on Windows Machines REF: #1550
* Corrected 404 response headers REF: #1620

#### Changes
* Removed duplicate DELETE SQL query for product attributes REF: #1379
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/account/download.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public function index() {

$this->data['continue'] = $this->url->link('account/account', '', 'SSL');

$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . '/1.1 404 Not Found');
$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . ' 404 Not Found');

if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/error/not_found.tpl')) {
$this->template = $this->config->get('config_template') . '/template/error/not_found.tpl';
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/account/order.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ public function info() {

$this->data['continue'] = $this->url->link('account/order', '', 'SSL');

$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . '/1.1 404 Not Found');
$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . ' 404 Not Found');

if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/error/not_found.tpl')) {
$this->template = $this->config->get('config_template') . '/template/error/not_found.tpl';
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/account/return.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public function info() {

$this->data['continue'] = $this->url->link('account/return', '', 'SSL');

$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . '/1.1 404 Not Found');
$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . ' 404 Not Found');

if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/error/not_found.tpl')) {
$this->template = $this->config->get('config_template') . '/template/error/not_found.tpl';
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/error/not_found.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function index() {

$this->data['button_continue'] = $this->language->get('button_continue');

$this->response->addheader($this->request->server['SERVER_PROTOCOL'] . '/1.1 404 not found');
$this->response->addheader($this->request->server['SERVER_PROTOCOL'] . ' 404 not found');

$this->data['continue'] = $this->url->link('common/home');

Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/information/information.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function index() {

$this->data['continue'] = $this->url->link('common/home');

$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . '/1.1 404 Not Found');
$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . ' 404 Not Found');

if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/error/not_found.tpl')) {
$this->template = $this->config->get('config_template') . '/template/error/not_found.tpl';
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/payment/pp_express.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1539,7 +1539,7 @@ public function checkoutReturn() {

unset($this->session->data['success']);

$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . '/1.1 404 Not Found');
$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . ' 404 Not Found');

if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/error/not_found.tpl')) {
$this->template = $this->config->get('config_template') . '/template/error/not_found.tpl';
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/product/category.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ public function index() {

$this->data['continue'] = $this->url->link('common/home');

$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . '/1.1 404 Not Found');
$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . ' 404 Not Found');

if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/error/not_found.tpl')) {
$this->template = $this->config->get('config_template') . '/template/error/not_found.tpl';
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/product/manufacturer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ public function info() {

$this->data['continue'] = $this->url->link('common/home');

$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . '/1.1 404 Not Found');
$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . ' 404 Not Found');

if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/error/not_found.tpl')) {
$this->template = $this->config->get('config_template') . '/template/error/not_found.tpl';
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/product/product.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ public function index() {

$this->data['continue'] = $this->url->link('common/home');

$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . '/1.1 404 Not Found');
$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . ' 404 Not Found');

if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/error/not_found.tpl')) {
$this->template = $this->config->get('config_template') . '/template/error/not_found.tpl';
Expand Down

0 comments on commit 570ae9c

Please sign in to comment.