adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-18 23:53:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolved issue 0000708: Error on synchronization

Browse Source 
Resolved issue 0000709: Error with $conf['default_admin_layout']

Merge BSF 2037:2039 into branch-1_7

git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2040 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2007-06-21 21:00:09 +00:00
parent 58dc3aa595
commit 97703aa9de
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_user.inc.php
+5 -8
View File
@@ -144,6 +144,7 @@ function setup_style($style)
function build_user( $user_id, $use_cache )
{
global $conf;
$user['id'] = $user_id;
$user = array_merge( $user, getuserdata($user_id, $use_cache) );
$user['is_the_guest'] = ($user['id'] == $conf['guest_id']);
@@ -152,23 +153,19 @@ function build_user( $user_id, $use_cache )
// calculation of the number of picture to display per page
$user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page'];
// include template/theme configuration
if (defined('IN_ADMIN') and IN_ADMIN)
if (is_admin($user['status']))
{
list($user['template'], $user['theme']) =
list($user['admin_template'], $user['admin_theme']) =
explode
(
'/',
isset($conf['default_admin_layout']) ? $conf['default_admin_layout']
: $user['template']
);
// TODO : replace $conf['admin_layout'] by $user['admin_layout']
}
else
{
list($user['template'], $user['theme']) = explode('/', $user['template']);
}
list($user['template'], $user['theme']) = explode('/', $user['template']);
return $user;
}