diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-11 14:21:45 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-11 14:21:45 +0000 |
| commit | dbae1db24c9bc264945d841b76642c5d14a35a63 (patch) | |
| tree | f02d5f54c53ea77dd55f168aa6a578885043bc47 /phpBB/includes | |
| parent | 82454165c31d1e67146fa7c548866067b1138318 (diff) | |
| download | forums-dbae1db24c9bc264945d841b76642c5d14a35a63.tar forums-dbae1db24c9bc264945d841b76642c5d14a35a63.tar.gz forums-dbae1db24c9bc264945d841b76642c5d14a35a63.tar.bz2 forums-dbae1db24c9bc264945d841b76642c5d14a35a63.tar.xz forums-dbae1db24c9bc264945d841b76642c5d14a35a63.zip | |
merge some changes/fixes
henry: is your viewonline fix/change missing? ;)
git-svn-id: file:///svn/phpbb/trunk@8503 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/auth.php | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 0d0f058392..9ddd8ff582 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -273,13 +273,19 @@ class acp_attachments { $l_explain = (isset($user->lang[$vars['lang'] . '_EXPLAIN'])) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : ''; } + + $content = build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars); + if (empty($content)) + { + continue; + } $template->assign_block_vars('options', array( 'KEY' => $config_key, 'TITLE' => $user->lang[$vars['lang']], 'S_EXPLAIN' => $vars['explain'], 'TITLE_EXPLAIN' => $l_explain, - 'CONTENT' => build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars), + 'CONTENT' => $content, ) ); diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index c1e94000db..0e9be94550 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -565,7 +565,7 @@ class acp_board 'TITLE' => (isset($user->lang[$vars['lang']])) ? $user->lang[$vars['lang']] : $vars['lang'], 'S_EXPLAIN' => $vars['explain'], 'TITLE_EXPLAIN' => $l_explain, - 'CONTENT' => build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars), + 'CONTENT' => $content, ) ); diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index a9e64b74ae..9240db271c 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -1156,7 +1156,7 @@ class acp_permissions } // Not ideal, due to the filesort, non-use of indexes, etc. - $sql = 'SELECT DISTINCT u.user_id, u.username + $sql = 'SELECT DISTINCT u.user_id, u.username, u.username_clean, u.user_regdate FROM ' . USERS_TABLE . ' u, ' . ACL_USERS_TABLE . " a WHERE u.user_id = a.user_id $sql_forum_id diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index 16accea94e..3512d14d56 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -801,7 +801,7 @@ class auth { $this->_set_group_hold_ary($hold_ary[$row['forum_id']], $row['auth_option_id'], $row['auth_setting']); } - else + else if (!empty($this->role_cache[$row['auth_role_id']])) { foreach (unserialize($this->role_cache[$row['auth_role_id']]) as $option_id => $setting) { |