aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-03-13 21:21:39 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-03-13 21:21:39 +0100
commit9e7ad8639887a25bf73de857497c9b55cc3609a2 (patch)
treed0a70f19a736bba1c6785dbf0f40769c2a985531 /phpBB/phpbb
parent66f9c09ba502e39ceab72a4bcf98ee90371dc7aa (diff)
parent8d8dbb21296aba33a0bd23fb924af0e23d24b8c4 (diff)
downloadforums-9e7ad8639887a25bf73de857497c9b55cc3609a2.tar
forums-9e7ad8639887a25bf73de857497c9b55cc3609a2.tar.gz
forums-9e7ad8639887a25bf73de857497c9b55cc3609a2.tar.bz2
forums-9e7ad8639887a25bf73de857497c9b55cc3609a2.tar.xz
forums-9e7ad8639887a25bf73de857497c9b55cc3609a2.zip
Merge pull request #5509 from mrgoldy/ticket/15939
[ticket/15939] Fix Pagination docblocks
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/pagination.php8
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)
{