mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

- fixed a referencing problem with objects (PHP4/5 conflict)

Browse Source 
- 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
This commit is contained in:
Nils Adermann
2007-02-17 14:14:56 +00:00
parent 0af3306ee4
commit b0d453098b
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions_convert.php
View File

@@ -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);