diff options
| author | 3Di <three3di@hotmail.it> | 2019-03-23 05:09:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-23 05:09:17 +0100 |
| commit | 6921565efe4674c51eb08326313cfca3349eedd5 (patch) | |
| tree | dabee12a9a81fe778be6769c5f1abc5be36ab9cf /phpBB/phpbb/pagination.php | |
| parent | 6c1664f6d3b85c1b4d620870444c8f4b82b08e57 (diff) | |
| parent | 0d04f53f374db12a1a285992a9c789a836848b3e (diff) | |
| download | forums-6921565efe4674c51eb08326313cfca3349eedd5.tar forums-6921565efe4674c51eb08326313cfca3349eedd5.tar.gz forums-6921565efe4674c51eb08326313cfca3349eedd5.tar.bz2 forums-6921565efe4674c51eb08326313cfca3349eedd5.tar.xz forums-6921565efe4674c51eb08326313cfca3349eedd5.zip | |
Merge branch '3.2.x' into ticket/15948
Diffstat (limited to 'phpBB/phpbb/pagination.php')
| -rw-r--r-- | phpBB/phpbb/pagination.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/pagination.php b/phpBB/phpbb/pagination.php index 40af5eda6b..a7086f6691 100644 --- a/phpBB/phpbb/pagination.php +++ b/phpBB/phpbb/pagination.php @@ -46,7 +46,7 @@ class pagination /** * Generate a pagination link based on the url and the page information * - * @param string $base_url is url prepended to all links generated within the function + * @param string|array $base_url is url prepended to all links generated within the function * If you use page numbers inside your controller route, base_url should contains a placeholder (%d) * for the page. Also be sure to specify the pagination path information into the start_name argument * @param string $on_page is the page for which we want to generate the link @@ -69,7 +69,7 @@ class pagination * set $generate_page_link_override to the new URL value * * @event core.pagination_generate_page_link - * @var string base_url is url prepended to all links generated within the function + * @var string|array base_url is url prepended to all links generated within the function * If you use page numbers inside your controller route, base_url should contains a placeholder (%d) * for the page. Also be sure to specify the pagination path information into the start_name argument * @var string on_page is the page for which we want to generate the link @@ -120,7 +120,7 @@ class pagination * Generate template rendered pagination * Allows full control of rendering of pagination with the template * - * @param string $base_url is url prepended to all links generated within the function + * @param string|array $base_url is url prepended to all links generated within the function * If you use page numbers inside your controller route, base_url should contains a placeholder (%d) * for the page. Also be sure to specify the pagination path information into the start_name argument * @param string $block_var_name is the name assigned to the pagination data block within the template (example: <!-- BEGIN pagination -->) @@ -132,7 +132,7 @@ class pagination * @param int $start the item which should be considered currently active, used to determine the page we're on * @param bool $reverse_count determines whether we weight display of the list towards the start (false) or end (true) of the list * @param bool $ignore_on_page decides whether we enable an active (unlinked) item, used primarily for embedded lists - * @return null + * @return void */ public function generate_template_pagination($base_url, $block_var_name, $start_name, $num_items, $per_page, $start = 1, $reverse_count = false, $ignore_on_page = false) { |