diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-02-17 14:14:56 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-02-17 14:14:56 +0000 |
| commit | b0d453098b5359aa40db3fd22e5d472040fa0b64 (patch) | |
| tree | ee691d71c4b6d211e938dc52165fd5b778acc682 /phpBB/includes/functions_convert.php | |
| parent | 0af3306ee40810029d1b83a35f229661dc1bfe7a (diff) | |
| download | forums-b0d453098b5359aa40db3fd22e5d472040fa0b64.tar forums-b0d453098b5359aa40db3fd22e5d472040fa0b64.tar.gz forums-b0d453098b5359aa40db3fd22e5d472040fa0b64.tar.bz2 forums-b0d453098b5359aa40db3fd22e5d472040fa0b64.tar.xz forums-b0d453098b5359aa40db3fd22e5d472040fa0b64.zip | |
- fixed a referencing problem with objects (PHP4/5 conflict)
- user_group_auth can take data from both target and source database
git-svn-id: file:///svn/phpbb/trunk@7002 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_convert.php')
| -rw-r--r-- | phpBB/includes/functions_convert.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 4244645af8..fe72f3fa9e 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1066,7 +1066,7 @@ function add_user_group($group_id, $user_id, $group_leader=false) * @param string $group The name of the special group to add to * @param string $select_query An SQL query to retrieve the user(s) to add to the group */ -function user_group_auth($group, $select_query) +function user_group_auth($group, $select_query, $use_src_db) { global $convert, $phpbb_root_path, $config, $user, $db, $src_db, $same_db; @@ -1089,7 +1089,7 @@ function user_group_auth($group, $select_query) return; } - if ($same_db) + if ($same_db || !$use_src_db) { $sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' (user_id, group_id, user_pending) ' . str_replace('{' . strtoupper($group) . '}', $group_id . ', 0', $select_query); |