Skip to content

Commit 2e976b8

Browse files
committed
Fix bug.
1 parent 0badd7c commit 2e976b8

File tree

8 files changed

+11
-25
lines changed

8 files changed

+11
-25
lines changed

model/blog/post.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*
2525
* @version 0.1.0
2626
*/
27+
2728
include_once _PS_MODULE_DIR_ . 'prestablog/class/news.class.php';
2829

2930
class ModelBlogPost extends Model

model/blog/url.php

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,19 @@ public function link($params)
2828
$ok_rewrite_year = '';
2929
$ok_rewrite_month = '';
3030

31-
$ko_rewrite = '';
32-
$ko_rewrite_id = '';
33-
$ko_rewrite_do = '';
34-
$ko_rewrite_cat = '';
35-
$ko_rewrite_page = '';
36-
$ko_rewrite_year = '';
37-
$ko_rewrite_month = '';
38-
3931
if (isset($params['do']) && $params['do'] != '') {
40-
$ko_rewrite_do = 'do='.$params['do'];
4132
$ok_rewrite_do = $params['do'];
4233
$param += 1;
4334
}
4435
if (isset($params['id']) && $params['id'] != '') {
45-
$ko_rewrite_id = '&id='.$params['id'];
4636
$ok_rewrite_id = '-n'.$params['id'];
4737
$param += 1;
4838
}
4939
if (isset($params['c']) && $params['c'] != '') {
50-
$ko_rewrite_cat = '&c='.$params['c'];
5140
$ok_rewrite_cat = '-c'.$params['c'];
5241
$param += 1;
5342
}
5443
if (isset($params['start']) && isset($params['p']) && $params['start'] != '' && $params['p'] != '') {
55-
$ko_rewrite_page = '&start='.$params['start'].'&p='.$params['p'];
5644
$ok_rewrite_page = $params['start'].'p'.$params['p'];
5745
$param += 1;
5846
}
@@ -74,12 +62,10 @@ public function link($params)
7462
$param += 1;
7563
}
7664
if (isset($params['y']) && $params['y'] != '') {
77-
$ko_rewrite_year = '&y='.$params['y'];
7865
$ok_rewrite_year = 'y'.$params['y'];
7966
$param += 1;
8067
}
8168
if (isset($params['m']) && $params['m'] != '') {
82-
$ko_rewrite_month = '&m='.$params['m'];
8369
$ok_rewrite_month = '-m'.$params['m'];
8470
$param += 1;
8571
}
@@ -93,21 +79,14 @@ public function link($params)
9379
$ok_rewrite = $base_url_blog.'/'.$ok_rewrite_do.$ok_rewrite_categorie.$ok_rewrite_page;
9480
$ok_rewrite .= $ok_rewrite_year.$ok_rewrite_month.$ok_rewrite_titre.$ok_rewrite_seo;
9581
$ok_rewrite .= $ok_rewrite_cat.$ok_rewrite_id;
96-
$ko_rewrite = '?fc=module&module=prestablog&controller=blog&'.ltrim(
97-
$ko_rewrite_do.$ko_rewrite_id.$ko_rewrite_cat.$ko_rewrite_page.$ko_rewrite_year.$ko_rewrite_month,
98-
'&'
99-
);
10082
} elseif (isset($params['rss'])) {
10183
if ($params['rss'] == 'all') {
10284
$ok_rewrite = 'rss';
103-
$ko_rewrite = '?fc=module&module=prestablog&controller=rss';
10485
} else {
10586
$ok_rewrite = 'rss/'.$params['rss'];
106-
$ko_rewrite = '?fc=module&module=prestablog&controller=rss&rss='.$params['rss'];
10787
}
10888
} else {
10989
$ok_rewrite = $base_url_blog;
110-
$ko_rewrite = '?fc=module&module=prestablog&controller=blog';
11190
}
11291

11392
if (!isset($params['id_lang'])) {

model/store/category.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @version 0.1.0
1212
*/
13+
1314
use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
1415

1516
class ModelStoreCategory extends Model

resolver/blog/category.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @version 0.1.0
1212
*/
13+
1314
class ResolverBlogCategory extends Resolver
1415
{
1516
private $status = false;

resolver/blog/post.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @version 0.1.0
1212
*/
13+
1314
class ResolverBlogPost extends Resolver
1415
{
1516
public function __construct($registry)
@@ -107,11 +108,11 @@ public function getList($args)
107108
'content' => $posts,
108109
'first' => $args['page'] === 1,
109110
'last' => $args['page'] === ceil($product_total / $args['size']),
110-
'number' => (int) $args['page'],
111+
'number' => (int)$args['page'],
111112
'numberOfElements' => count($posts),
112-
'size' => (int) $args['size'],
113-
'totalPages' => (int) ceil($product_total / $args['size']),
114-
'totalElements' => (int) $product_total,
113+
'size' => (int)$args['size'],
114+
'totalPages' => (int)ceil($product_total / $args['size']),
115+
'totalElements' => (int)$product_total,
115116
);
116117
} else {
117118
return array(

resolver/common/home.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @version 0.1.0
1212
*/
13+
1314
class ResolverCommonHome extends Resolver
1415
{
1516
public function get()

resolver/common/page.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @version 0.1.0
1212
*/
13+
1314
class ResolverCommonPage extends Resolver
1415
{
1516
public function get($args)

resolver/store/category.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @version 0.1.0
1212
*/
13+
1314
class ResolverStoreCategory extends Resolver
1415
{
1516
public function get($args)

0 commit comments

Comments
 (0)