diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-01-06 23:03:08 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-01-06 23:03:08 +0000 |
| commit | 7a1b178fe6454f73c4afd761bb54306d24611287 (patch) | |
| tree | ad4805fb03c129a776ebd8dd80e0e617f6be6bba /phpBB/includes/ucp/ucp_pm_options.php | |
| parent | b66f68a7799a63949779f0092ec88deff2be0f57 (diff) | |
| download | forums-7a1b178fe6454f73c4afd761bb54306d24611287.tar forums-7a1b178fe6454f73c4afd761bb54306d24611287.tar.gz forums-7a1b178fe6454f73c4afd761bb54306d24611287.tar.bz2 forums-7a1b178fe6454f73c4afd761bb54306d24611287.tar.xz forums-7a1b178fe6454f73c4afd761bb54306d24611287.zip | |
- merged getting of unread pm count function to get_folder function
- made folder usable within the template (especially custom folder)
git-svn-id: file:///svn/phpbb/trunk@5048 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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php index 7b4a213e0b..53946e3c00 100644 --- a/phpBB/includes/ucp/ucp_pm_options.php +++ b/phpBB/includes/ucp/ucp_pm_options.php @@ -564,9 +564,9 @@ function define_rule_option($hardcoded, $rule_option, $rule_lang, $check_ary) ); } -function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule_conditions, &$rule_save_ary) +function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule_conditions) { - global $db, $template, $_REQUEST; + global $db, $template; $template->assign_vars(array( 'S_COND_DEFINED' => true, @@ -612,6 +612,7 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule FROM ' . USERS_TABLE . " WHERE username = '" . $db->sql_escape($rule_string) . "'"; $result = $db->sql_query($sql); + if (!($rule_user_id = $db->sql_fetchfield('user_id', 0, $result))) { $rule_string = ''; @@ -624,6 +625,7 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule FROM ' . USERS_TABLE . " WHERE user_id = $rule_user_id"; $result = $db->sql_query($sql); + if (!($rule_string = $db->sql_fetchfield('username', 0, $result))) { $rule_user_id = 0; |