merge r1228 from branch-1_6 into trunk

bug 345: cannot browse categories (Club Internet modified web server provides 
PATH_INFO even if it is empty)

fix 339: also added in create_listing_file.php

git-svn-id: http://piwigo.org/svn/trunk@1229 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2006-04-21 00:04:11 +00:00
parent b65bbc570e
commit c000b9ed60
2 changed files with 10 additions and 2 deletions
+1 -1
View File
@@ -53,7 +53,7 @@
$page['section'] = 'categories';
if ( isset($_SERVER["PATH_INFO"]) )
if ( isset($_SERVER["PATH_INFO"]) and !empty($_SERVER["PATH_INFO"]) )
{
$rewritten = $_SERVER["PATH_INFO"];
$rewritten = str_replace('//', '/', $rewritten);
+9 -1
View File
@@ -165,7 +165,15 @@ function get_sync_iptc_data($file)
$iptc['keywords'] = preg_replace('/[.;]/', ',', $iptc['keywords']);
$iptc['keywords'] = preg_replace('/^,+|,+$/', '', $iptc['keywords']);
}
$iptc['keywords'] = implode(
',',
array_unique(
explode(
',',
$iptc['keywords']
)
)
);
return $iptc;
}