diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-11-01 10:39:56 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-11-01 10:39:56 +0100 |
| commit | a6c5204cbdd018851a3a1bcfa5ad1d0003dd38f4 (patch) | |
| tree | ffd08c777344a252e62a16bfc0892a41637a34f3 /phpBB/phpbb | |
| parent | 131c26449228221f0028711e41ab79191ab2c25a (diff) | |
| parent | 33ceceda021160b73fe9d7333e9e950308da5569 (diff) | |
| download | forums-a6c5204cbdd018851a3a1bcfa5ad1d0003dd38f4.tar forums-a6c5204cbdd018851a3a1bcfa5ad1d0003dd38f4.tar.gz forums-a6c5204cbdd018851a3a1bcfa5ad1d0003dd38f4.tar.bz2 forums-a6c5204cbdd018851a3a1bcfa5ad1d0003dd38f4.tar.xz forums-a6c5204cbdd018851a3a1bcfa5ad1d0003dd38f4.zip | |
Merge pull request #4973 from DavidIQ/ticket/15372
[ticket/15372] Add permission for listing topics without being able to read them
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v32x/f_list_topics_permission_add.php | 31 | ||||
| -rw-r--r-- | phpBB/phpbb/pagination.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/permissions.php | 1 |
3 files changed, 37 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v32x/f_list_topics_permission_add.php b/phpBB/phpbb/db/migration/data/v32x/f_list_topics_permission_add.php new file mode 100644 index 0000000000..49727e5a62 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/f_list_topics_permission_add.php @@ -0,0 +1,31 @@ +<?php +/** + * + * This file is part of the phpBB Forum Software package. + * + * @copyright (c) phpBB Limited <https://www.phpbb.com> + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v32x; + +class f_list_topics_permission_add extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\v321', + ); + } + + public function update_data() + { + return array( + array('permission.add', array('f_list_topics', false, 'f_read')), + ); + } +} diff --git a/phpBB/phpbb/pagination.php b/phpBB/phpbb/pagination.php index a5a95b096d..40af5eda6b 100644 --- a/phpBB/phpbb/pagination.php +++ b/phpBB/phpbb/pagination.php @@ -136,6 +136,11 @@ class pagination */ 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) { + if (empty($base_url)) + { + return; + } + $total_pages = ceil($num_items / $per_page); $on_page = $this->get_on_page($per_page, $start); $u_previous_page = $u_next_page = ''; diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php index c9181e6202..7697884b6a 100644 --- a/phpBB/phpbb/permissions.php +++ b/phpBB/phpbb/permissions.php @@ -260,6 +260,7 @@ class permissions // Forum Permissions 'f_list' => array('lang' => 'ACL_F_LIST', 'cat' => 'actions'), + 'f_list_topics' => array('lang' => 'ACL_F_LIST_TOPICS', 'cat' => 'actions'), 'f_read' => array('lang' => 'ACL_F_READ', 'cat' => 'actions'), 'f_search' => array('lang' => 'ACL_F_SEARCH', 'cat' => 'actions'), 'f_subscribe' => array('lang' => 'ACL_F_SUBSCRIBE', 'cat' => 'actions'), |