archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from revision 2228.

Browse source 
Resolved bugs:
741 and 793: Added user does not appear in listing.
769: show email address in adviser mode when editing user profil.
800: get_absolute_root_url does not work with https protocol.

git-svn-id: http://piwigo.org/svn/trunk@2229 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2008-02-29 13:10:58 +00:00
commit c38328da6b
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/functions_url.inc.php
View file

@ -60,7 +60,15 @@ function get_absolute_root_url($with_scheme=true)
$url = '';
if ($with_scheme)
{
$url .= 'http://'.$_SERVER['HTTP_HOST'];
if (empty($_SERVER['HTTPS']))
{
$url .= 'http://';
}
else
{
$url .= 'https://';
}
$url .= $_SERVER['HTTP_HOST'];
if ($_SERVER['SERVER_PORT'] != 80)
{
$url_port = ':'.$_SERVER['SERVER_PORT'];