From aed45457d79401bea60b556456ffc36dd7df889f Mon Sep 17 00:00:00 2001 From: rub Date: Wed, 27 Feb 2008 22:00:13 +0000 Subject: little corrections Merge branch-1_7 2219:2220 into BSF git-svn-id: http://piwigo.org/svn/trunk@2221 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions.inc.php | 2 +- include/functions_user.inc.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/functions.inc.php b/include/functions.inc.php index 243f2481b..41124f782 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -608,7 +608,7 @@ INSERT INTO '.HISTORY_TABLE.' '.$user['id'].', \''.$_SERVER['REMOTE_ADDR'].'\', '.(isset($page['section']) ? "'".$page['section']."'" : 'NULL').', - '.(isset($page['category']) ? $page['category']['id'] : 'NULL').', + '.(isset($page['category']['id']) ? $page['category']['id'] : 'NULL').', '.(isset($image_id) ? $image_id : 'NULL').', '.(isset($image_type) ? "'".$image_type."'" : 'NULL').', '.(isset($tags_string) ? "'".$tags_string."'" : 'NULL').' diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index 16a67fd8d..53d6da3c1 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ // | file : $Id$ // | last update : $Date$ @@ -1132,9 +1132,10 @@ function get_access_type_status($user_status='') $access_type_status = ACCESS_WEBMASTER; break; } - case 'default': + default: { $access_type_status = ACCESS_NONE; + break; } } -- cgit v1.2.3