diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-30 13:32:18 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-30 13:32:18 +0000 |
| commit | 816bc5da616f1326d97fa20ccf59f3b1bca9fe1d (patch) | |
| tree | 912bfdefef01c5b362af07bce0517cea0a0983d2 /phpBB/includes/ucp/ucp_pm_options.php | |
| parent | ef427b6483e89d797fed11485bdc857039d3b61f (diff) | |
| download | forums-816bc5da616f1326d97fa20ccf59f3b1bca9fe1d.tar forums-816bc5da616f1326d97fa20ccf59f3b1bca9fe1d.tar.gz forums-816bc5da616f1326d97fa20ccf59f3b1bca9fe1d.tar.bz2 forums-816bc5da616f1326d97fa20ccf59f3b1bca9fe1d.tar.xz forums-816bc5da616f1326d97fa20ccf59f3b1bca9fe1d.zip | |
"Ghost" topics in active topics list when shadow topics and corresponding topic in same resultset [#10313]
Find a member supporting hidden groups for those able to see them [#10305]
Display hidden groups for all those able to see them across the board (composing messages, viewonline)
Fix space for sending PM's to groups
Let the permissions_phpbb file be included the same way as all other permission files [#10301]
Add request_a-z+ handling within modules_auth suggested by Pyramide. This will allow modders to directly show/hide their module in addition to !empty() $_REQUEST variables. [#10297]
git-svn-id: file:///svn/phpbb/trunk@7433 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_options.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_options.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php index cb55236936..f242c864b6 100644 --- a/phpBB/includes/ucp/ucp_pm_options.php +++ b/phpBB/includes/ucp/ucp_pm_options.php @@ -717,7 +717,7 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule AND ug.user_id = ' . $user->data['user_id'] . ' AND ug.user_pending = 0 ) - WHERE (ug.user_id = ' . $user->data['user_id'] . ' OR g.group_type <> ' . GROUP_HIDDEN . ') + WHERE (ug.user_id = ' . $user->data['user_id'] . ' OR g.group_type <> ' . GROUP_HIDDEN . ') AND'; } else |