Issue ID 0000529 Fixed.

Problem with $_SERVER['SCRIPT_FILENAME'] on IIS server

Merge branch-1_6 1685:1686 into BSF

git-svn-id: http://piwigo.org/svn/trunk@1687 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2006-12-31 17:08:37 +00:00
parent 48879ca177
commit 9c914a2b66
5 changed files with 42 additions and 6 deletions
+2 -2
View File
@@ -86,7 +86,7 @@ $tokens = explode(
// );
$next_token = 0;
if (basename($_SERVER['SCRIPT_FILENAME']) == 'picture.php')
if (script_basename() == 'picture.php')
{ // the first token must be the identifier for the picture
if ( isset($_GET['image_id'])
and isset($_GET['cat']) and is_numeric($_GET['cat']) )
@@ -706,7 +706,7 @@ if (isset($page['chronology_field']))
$page['cat_nb_images'] = isset($page['items']) ? count($page['items']) : 0;
if (basename($_SERVER['SCRIPT_FILENAME']) == 'picture.php'
if (script_basename() == 'picture.php'
and !isset($page['image_id']) )
{
if ( !empty($page['items']) )