Commit 948e079ff4874d3d755ab058aea45285bbb12281
1 parent
b3e3a49d
new link in open all
Showing
4 changed files
with
8 additions
and
8 deletions
Show diff stats
src/app/frontend/controllers/DealerController.php
| ... | ... | @@ -950,7 +950,7 @@ class DealerController extends \controllers\ControllerBase |
| 950 | 950 | $params = $this->dispatcher->getParams(); |
| 951 | 951 | $subtype = $params['subtype']; |
| 952 | 952 | $page = !empty( $params['page'] ) ? $params['page'] : 1; |
| 953 | - $sort = !empty( $params['sort'] ) ? explode( '-', $params['sort'] ) : [0,3]; | |
| 953 | + $sort = !empty( $params['sort'] ) ? explode( '-', $params['sort'] ) : [0,5]; | |
| 954 | 954 | sort($sort); |
| 955 | 955 | $type_child = NULL; |
| 956 | 956 | |
| ... | ... | @@ -994,7 +994,7 @@ class DealerController extends \controllers\ControllerBase |
| 994 | 994 | $catalog_id = $catalog['catalog']['sub']['id'] = empty( $type_child ) ? $catalog['catalog']['sub']['id'] : $catalog['catalog']['sub']['sub']['id']; |
| 995 | 995 | |
| 996 | 996 | $sort_default_1 = 0; |
| 997 | - $sort_default_2 = 3; | |
| 997 | + $sort_default_2 = 5; | |
| 998 | 998 | |
| 999 | 999 | if( !empty( $sort ) ) |
| 1000 | 1000 | { | ... | ... |
src/app/frontend/controllers/PageController.php
| ... | ... | @@ -269,7 +269,7 @@ |
| 269 | 269 | $params = $this->dispatcher->getParams(); |
| 270 | 270 | $subtype = $params['subtype']; |
| 271 | 271 | $page = !empty( $params['page'] ) ? $params['page'] : 1; |
| 272 | - $sort = !empty( $params['sort'] ) ? explode( '-', $params['sort'] ) : [0,3]; | |
| 272 | + $sort = !empty( $params['sort'] ) ? explode( '-', $params['sort'] ) : [0,5]; | |
| 273 | 273 | sort($sort); |
| 274 | 274 | $type_child = NULL; |
| 275 | 275 | |
| ... | ... | @@ -314,7 +314,7 @@ |
| 314 | 314 | |
| 315 | 315 | |
| 316 | 316 | $sort_default_1 = 0; |
| 317 | - $sort_default_2 = 3; | |
| 317 | + $sort_default_2 = 5; | |
| 318 | 318 | |
| 319 | 319 | if( !empty( $sort ) ) |
| 320 | 320 | { |
| ... | ... | @@ -508,12 +508,12 @@ |
| 508 | 508 | $filter_alias = isset( $params['filter_alias'] ) && !empty( $params['filter_alias'] ) ? $params['filter_alias'] : ''; |
| 509 | 509 | $price = isset( $params['price'] ) && !empty( $params['price'] ) ? $params['price'] : ''; |
| 510 | 510 | $page = !empty( $params['page'] ) ? $params['page'] : 1; |
| 511 | - $sort = !empty( $params['sort'] ) ? explode( '-', $params['sort'] ) : [0,3]; | |
| 511 | + $sort = !empty( $params['sort'] ) ? explode( '-', $params['sort'] ) : [0,5]; | |
| 512 | 512 | sort($sort); |
| 513 | 513 | $price_array = !empty( $price ) ? explode( '-', $price ) : []; |
| 514 | 514 | |
| 515 | 515 | $sort_default_1 = 0; |
| 516 | - $sort_default_2 = 3; | |
| 516 | + $sort_default_2 = 5; | |
| 517 | 517 | |
| 518 | 518 | if( !empty( $sort ) ) |
| 519 | 519 | { | ... | ... |
src/app/frontend/views/index.php
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> |
| 7 | 7 | <?php |
| 8 | 8 | if (preg_match("/page/i", $_SERVER['REQUEST_URI']) && !preg_match("/prof_tips/i", $_SERVER['REQUEST_URI'])) { |
| 9 | - echo "<link rel='canonical' href='http://".$_SERVER['HTTP_HOST'].$this->seoUrl->setUrl($this->url->get($page_url_for_sort['3']))."?all=1'>"; | |
| 9 | + echo "<link rel='canonical' href='http://".$_SERVER['HTTP_HOST'].$this->seoUrl->setUrl($this->url->get($page_url_for_sort['5']))."?all=1'>"; | |
| 10 | 10 | } |
| 11 | 11 | if (preg_match("/sort-/i", $_SERVER['REQUEST_URI']) && !isset($seo) && empty($seo)) { |
| 12 | 12 | echo "<meta name=\"robots\" content=\"noindex, follow\"/>"; | ... | ... |
src/app/frontend/views/page/subtype.php
| ... | ... | @@ -217,7 +217,7 @@ |
| 217 | 217 | { |
| 218 | 218 | echo'<div class="inner1"><div class="paginate" align="center">'; |
| 219 | 219 | echo $paginate; |
| 220 | - if(empty($_GET['all']))echo'<div align="center"><a href="'.$this->seoUrl->setUrl($this->url->get($page_url_for_sort['3'])).'?all=1#item_'.($page*12).'" style="display:block;margin-bottom:20px;">'.$t->_("show_all").'</a></div>'; | |
| 220 | + if(empty($_GET['all']))echo'<div align="center"><a href="'.$this->seoUrl->setUrl($this->url->get($page_url_for_sort['5'])).'?all=1#item_'.($page*12).'" style="display:block;margin-bottom:20px;">'.$t->_("show_all").'</a></div>'; | |
| 221 | 221 | echo '</div></div>'; |
| 222 | 222 | |
| 223 | 223 | } | ... | ... |