Ignore:
Timestamp:
Jan 9, 2014, 6:11:33 PM (10 years ago)
Author:
mistic100
Message:

update Hybridauth, update guides

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/oAuth/include/hybridauth/Hybrid/Auth.php

    r20293 r26555  
    1515class Hybrid_Auth
    1616{
    17         public static $version = "2.1.1-dev";
     17        public static $version = "2.1.2";
    1818
    1919        public static $config  = array();
     
    250250                        $params = Hybrid_Auth::storage()->get( "hauth_session.$providerId.id_provider_params" );
    251251                       
    252                         Hybrid_Logger::debug( "Hybrid_Auth::setup( $providerId ), no params given. Trying to get the stored for this provider.", $params );
     252                        Hybrid_Logger::debug( "Hybrid_Auth::setup( $providerId ), no params given. Trying to get the sotred for this provider.", $params );
    253253                }
    254254
     
    387387
    388388                // use port if non default
    389                 $url .=
    390                         isset( $_SERVER['SERVER_PORT'] )
    391                         &&( ($protocol === 'http://' && $_SERVER['SERVER_PORT'] != 80) || ($protocol === 'https://' && $_SERVER['SERVER_PORT'] != 443) )
    392                         ? ':' . $_SERVER['SERVER_PORT']
    393                         : '';
     389                if( isset( $_SERVER['SERVER_PORT'] ) && strpos( $url, ':'.$_SERVER['SERVER_PORT'] ) === FALSE ) {
     390                        $url .= ($protocol === 'http://' && $_SERVER['SERVER_PORT'] != 80 && !isset( $_SERVER['HTTP_X_FORWARDED_PROTO']))
     391                                || ($protocol === 'https://' && $_SERVER['SERVER_PORT'] != 443 && !isset( $_SERVER['HTTP_X_FORWARDED_PROTO']))
     392                                ? ':' . $_SERVER['SERVER_PORT']
     393                                : '';
     394                }
    394395
    395396                if( $request_uri ){
Note: See TracChangeset for help on using the changeset viewer.