Changeset 2863:c14573122523

Timestamp:

12/20/14 15:49:27 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.7

Message:

Nb of post displayed on home page (first page) should not be applied on first pages of other contexts (tags, category, search, …) : fixed

Location:

inc/public

Files:

• class.dc.template.php (modified) (1 diff)
• lib.tpl.context.php (modified) (1 diff)

inc/public/class.dc.template.php

@@ -1120 +1120 @@
                } else {
                     // nb of entries per page not specified -> use ctx settings
-                    $p .= "\$params['limit'] = (\$_page_number == 1 ? \$_ctx->nb_entry_first_page : \$_ctx->nb_entry_per_page);\n";
+                    $p .= "if ((\$core->url->type == 'default') || (\$core->url->type == 'default-page')) {\n";
+                    $p .= "    \$params['limit'] = (\$_page_number == 1 ? \$_ctx->nb_entry_first_page : \$_ctx->nb_entry_per_page);\n";
+                    $p .= "} else {\n";
+                    $p .= "    \$params['limit'] = \$_ctx->nb_entry_per_page;\n";
+                    $p .= "}\n";
                }
                // Set offset (aka index of first entry)
                if (!isset($attr['ignore_pagination']) || $attr['ignore_pagination'] == "0") {
                     // standard pagination, set offset
-                    $p .= "\$params['limit'] = array((\$_page_number == 1 ? 0 : (\$_page_number - 2) * \$_ctx->nb_entry_per_page + \$_ctx->nb_entry_first_page),\$params['limit']);\n";
+                    $p .= "if ((\$core->url->type == 'default') || (\$core->url->type == 'default-page')) {\n";
+                    $p .= "    \$params['limit'] = array((\$_page_number == 1 ? 0 : (\$_page_number - 2) * \$_ctx->nb_entry_per_page + \$_ctx->nb_entry_first_page),\$params['limit']);\n";
+                    $p .= "} else {\n";
+                    $p .= "    \$params['limit'] = array((\$_page_number - 1) * \$_ctx->nb_entry_per_page,\$params['limit']);\n";
+                    $p .= "}\n";
                } else {
                     // no pagination, get all posts from 0 to limit

inc/public/lib.tpl.context.php

@@ -216 +216 @@
 
           $nb_posts = $_ctx->pagination->f(0);
-          $nb_pages = ceil(($nb_posts - $_ctx->nb_entry_first_page) / $_ctx->nb_entry_per_page + 1);
+          if (($GLOBALS['core']->url->type == 'default') || ($GLOBALS['core']->url->type == 'default-page')) {
+               $nb_pages = ceil(($nb_posts - $_ctx->nb_entry_first_page) / $_ctx->nb_entry_per_page + 1);
+          } else {
+               $nb_pages = ceil($nb_posts / $_ctx->nb_entry_per_page);
+          }
 
           return $nb_pages;