Show
Ignore:
Timestamp:
02/29/08 14:10:58 (5 years ago)
Author:
patdenice
Message:

Merge from revision 2228.
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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/include/functions_url.inc.php

    r2215 r2229  
    6161  if ($with_scheme) 
    6262  { 
    63     $url .= 'http://'.$_SERVER['HTTP_HOST']; 
     63    if (empty($_SERVER['HTTPS'])) 
     64    { 
     65      $url .= 'http://'; 
     66    } 
     67    else 
     68    { 
     69      $url .= 'https://'; 
     70    } 
     71    $url .= $_SERVER['HTTP_HOST']; 
    6472    if ($_SERVER['SERVER_PORT'] != 80) 
    6573    {