Changeset 2886:361a37518b41 for inc

Timestamp:

12/28/14 20:45:12 (11 years ago)

Author:

Dsls

Branch:

2.7

Message:

Removed $_ctx value stacking. Fixes #2035

File:

• inc/public/class.dc.template.php (modified) (2 diffs)

inc/public/class.dc.template.php

@@ -1118 +1118 @@
                     // nb of entries per page specified in template -> regular pagination
                     $p .= "\$params['limit'] = ".$lastn.";\n";
-                    $p .= "\$_ctx->nb_entry_first_page = \$_ctx->nb_entry_per_page = ".$lastn.";\n";
+                    $p .= "\$nb_entry_first_page = \$nb_entry_per_page = ".$lastn.";\n";
                } else {
                     // nb of entries per page not specified -> use ctx settings
+                    $p .= "\$nb_entry_first_page=\$_ctx->nb_entry_first_page; \$nb_entry_per_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 .= "    \$params['limit'] = (\$_page_number == 1 ? \$nb_entry_first_page : \$nb_entry_per_page);\n";
                     $p .= "} else {\n";
-                    $p .= "    \$params['limit'] = \$_ctx->nb_entry_per_page;\n";
+                    $p .= "    \$params['limit'] = \$nb_entry_per_page;\n";
                     $p .= "}\n";
                }
@@ -1131 +1132 @@
                     // standard pagination, set offset
                     $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 .= "    \$params['limit'] = array((\$_page_number == 1 ? 0 : (\$_page_number - 2) * \$nb_entry_per_page + \$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 .= "    \$params['limit'] = array((\$_page_number - 1) * \$nb_entry_per_page,\$params['limit']);\n";
                     $p .= "}\n";
                } else {