Resolved issue 0000825: create_listing_file.php don't work with port server

Merge BSF 2336:2337 into branch-1_7


git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2338 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2008-05-14 21:54:45 +00:00
parent 428763fda6
commit 59262acebd
+5 -1
View File
@@ -143,7 +143,11 @@ $pwg_conf['icon_dir'] = $conf['gallery'].'/template/yoga/icon/';
$pwg_conf['scan_action'] = array('clean', 'test', 'generate');
// url of this script
$pwg_conf['this_url'] = 'http://'.$_SERVER['SERVER_NAME'].$_SERVER['PHP_SELF'];
$pwg_conf['this_url'] =
(empty($_SERVER['HTTPS']) ? 'http://' : 'https://')
.str_replace(':'.$_SERVER['SERVER_PORT'], '', $_SERVER['HTTP_HOST'])
.($_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : '')
.$_SERVER['PHP_SELF'];
// list of reserved directory names
$pwg_conf['reserved_directory_names'] = array($conf['thumbs'], $conf['high'], $conf['represent'], ".", "..", ".svn");