aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2008-02-27 21:58:20 +0000
committerrub <rub@piwigo.org>2008-02-27 21:58:20 +0000
commit8f354f008eec540d0055e7b774a64feec93ef561 (patch)
tree0bc7af837d5205b83193354628f5e67dcbbc67ff
parent352060bbe90905892473972ac2ddae57a7b2798a (diff)
little corrections
git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2220 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/functions.inc.php6
-rw-r--r--include/functions_user.inc.php5
2 files changed, 7 insertions, 4 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 5f448cdd1..d1756a82f 100644
--- a/include/functions.inc.php
+++ b/include/functions.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$
@@ -574,7 +574,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').'
@@ -704,6 +704,8 @@ function redirect_http( $url )
{
ob_clean();
}
+ // default url is on html format
+ $url = html_entity_decode($url);
header('Request-URI: '.$url);
header('Content-Location: '.$url);
header('Location: '.$url);
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 6d8c8b666..14666da7f 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$
@@ -1165,9 +1165,10 @@ function get_access_type_status($user_status='')
$access_type_status = ACCESS_WEBMASTER;
break;
}
- case 'default':
+ default:
{
$access_type_status = ACCESS_NONE;
+ break;
}
}