archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r11355 from branch 2.2 to trunk

Browse source 
bug 2340 fixed: external authentication was broken, error in SQL syntax and wrong PHP variable name was used.



git-svn-id: http://piwigo.org/svn/trunk@11356 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-06-14 08:25:45 +00:00
commit a9ee6d4944
1 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
include/functions_user.inc.php
View file

@ -321,6 +321,25 @@ SELECT ';
$row = pwg_db_fetch_assoc(pwg_query($query));
// retrieve additional user data ?
if ($conf['external_authentification'])
{
$query = '
SELECT
COUNT(1) AS counter
FROM '.USER_INFOS_TABLE.' AS ui
LEFT JOIN '.USER_CACHE_TABLE.' AS uc ON ui.user_id = uc.user_id
LEFT JOIN '.THEMES_TABLE.' AS t ON t.id = ui.theme
WHERE ui.user_id = '.$user_id.'
GROUP BY ui.user_id
;';
list($counter) = pwg_db_fetch_row(pwg_query($query));
if ($counter != 1)
{
create_user_infos($user_id);
}
}
// retrieve user info
$query = '
SELECT
@ -336,27 +355,6 @@ SELECT
$result = pwg_query($query);
$user_infos_row = pwg_db_fetch_assoc($result);
// retrieve additional user data ?
if ($conf['external_authentification'])
{
$query = '
SELECT
COUNT(1) AS counter,
FROM '.USER_INFOS_TABLE.' AS ui
LEFT JOIN '.USER_CACHE_TABLE.' AS uc ON ui.user_id = uc.user_id
LEFT JOIN '.THEMES_TABLE.' AS t ON t.id = ui.theme
WHERE ui.user_id = '.$user_id.'
GROUP BY ui.user_id
;';
if (pwg_db_fetch_row(pwg_query($query))!=1)
{
create_user_infos($user_id);
$result = pwg_query($user_info_query);
$user_infos_row = pwg_db_fetch_assoc($result);
}
}
// then merge basic + additional user data
$row = array_merge($row, $user_infos_row);