|
|
@@ -26,7 +26,19 @@
|
|
26
|
26
|
$id_post = $_GET["post"];
|
|
27
|
27
|
} else {
|
|
28
|
28
|
if (isset($param_url[1]) && $param_url[1]=="post") {
|
|
29
|
|
- $id_post = (isset($param_url[2])) ? ((is_numeric($param_url[2])) ? $param_url[2] : null) : null;
|
|
|
29
|
+ $id_post = (isset($param_url[2])) ? ((is_numeric($param_url[2])) ? $param_url[2] : NULL) : NULL;
|
|
|
30
|
+ } else {
|
|
|
31
|
+ $id_post = NULL;
|
|
|
32
|
+ }
|
|
|
33
|
+ }
|
|
|
34
|
+
|
|
|
35
|
+ if (isset($_GET["page"])) {
|
|
|
36
|
+ $page_num = $_GET["page"];
|
|
|
37
|
+ } else {
|
|
|
38
|
+ if (isset($param_url[1]) && $param_url[1]=="page") {
|
|
|
39
|
+ $page_num = (isset($param_url[2])) ? ((is_numeric($param_url[2])) ? $param_url[2] : NULL) : NULL;
|
|
|
40
|
+ } else {
|
|
|
41
|
+ $page_num = NULL;
|
|
30
|
42
|
}
|
|
31
|
43
|
}
|
|
32
|
44
|
|
|
|
@@ -40,8 +52,8 @@
|
|
40
|
52
|
|
|
41
|
53
|
$limit=$conf->postLimit;
|
|
42
|
54
|
|
|
43
|
|
- if(isset($_GET['page']) && is_numeric($_GET['page']) && $_GET['page']>0) { // Is defined the page and is numeric?
|
|
44
|
|
- $from = (($_GET['page']-1) * $limit);
|
|
|
55
|
+ if(isset($page_num) && is_numeric($page_num) && $page_num>0) { // Is defined the page and is numeric?
|
|
|
56
|
+ $from = (($page_num-1) * $limit);
|
|
45
|
57
|
} else {
|
|
46
|
58
|
$from = 0;
|
|
47
|
59
|
}
|
|
|
@@ -105,7 +117,8 @@
|
|
105
|
117
|
}
|
|
106
|
118
|
}
|
|
107
|
119
|
|
|
108
|
|
- echo pagination($tumble->getPostsNumber(), $limit, isset($_GET['page']) ? $_GET['page'] : 1, "index.php", 2); // Shows the pagination
|
|
|
120
|
+ echo pagination($tumble->getPostsNumber(), $limit, isset($page_num) ? $page_num : 1, array($conf->urlGelato."/index.php/page/[...]/","[...]"), 2);
|
|
|
121
|
+
|
|
109
|
122
|
|
|
110
|
123
|
} else {
|
|
111
|
124
|
$template->renderizaEtiqueta("No posts in this tumblelog.", "div","error");
|