diff options
| author | rub <rub@piwigo.org> | 2007-01-02 22:37:08 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2007-01-02 22:37:08 +0000 |
| commit | 481188f7ea77418b46100d66a383f9a98f4cd029 (patch) | |
| tree | d4e9a452ebac29e2907440838787e276dcbacb03 /include/section_init.inc.php | |
| parent | 0f2b554608c15cf92e3619dadfff188257f4f8e1 (diff) | |
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
Diffstat (limited to '')
| -rw-r--r-- | include/section_init.inc.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/section_init.inc.php b/include/section_init.inc.php index 622be2e07..29a5be5e8 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -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']) ) |