Issue ID 0000529 Re-Fixed.

Problem with "Options +MultiViews" .htaccess configuration.

Merge branch-1_6 1688:1689 into BSF

git-svn-id: http://piwigo.org/svn/trunk@1690 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2007-01-02 22:37:08 +00:00
parent 0f2b554608
commit 481188f7ea
5 changed files with 16 additions and 21 deletions
+2 -2
View File
@@ -86,7 +86,7 @@ $tokens = explode(
// );
$next_token = 0;
if (script_basename() == 'picture.php')
if (script_basename() == 'picture') // basename without file extention
{ // 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 (script_basename() == 'picture.php'
if (script_basename() == 'picture'
and !isset($page['image_id']) )
{
if ( !empty($page['items']) )