From dac7decfb5d01ff27797ba3ba39ea8af3766b89e Mon Sep 17 00:00:00 2001 From: plegall Date: Sun, 12 Feb 2006 21:52:16 +0000 Subject: improvement: $page['where'] string replaced by $page['items']. $page['where'] was an SQL clause used to retrieve pictures in #images table. $page['items'] is the list of picture ids of the current section. improvement: function initialize_category replaced by dedicated included PHP script include/section_init.inc.php. Code was refactored to improve readibility and maintenability. $page['navigation_bar'] is now build in category.php instead of initialize_category function. Function check_cat_id was also replaced by a piece of code in the new file. The file to include to display thumbnails from category.php is now set in section_init.inc.php instead of calculated in category.php. bug fix: the test for rel="up" link for standard HTML navigation links in category menu was not working with non numeric categories, such as "favorites". improvement: function check_login_authorization removed because useless but in profile.php. git-svn-id: http://piwigo.org/svn/trunk@1036 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/user.inc.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include/user.inc.php') diff --git a/include/user.inc.php b/include/user.inc.php index ad58b3f92..c22f4b369 100644 --- a/include/user.inc.php +++ b/include/user.inc.php @@ -59,8 +59,13 @@ if ($conf['apache_authentication'] and isset($_SERVER['REMOTE_USER'])) $user['is_the_guest'] = false; } -$use_cache = (defined('IN_ADMIN') and IN_ADMIN) ? false : true; -$user = array_merge($user, getuserdata($user['id'], $use_cache)); +$user = array_merge( + $user, + getuserdata( + $user['id'], + defined('IN_ADMIN') and IN_ADMIN ? false : true // use cache ? + ) + ); // properties of user guest are found in the configuration if ($user['is_the_guest']) -- cgit v1.2.3