@@ -551,7 +551,7 @@ protected function check_oauth_signature( $consumer, $oauth_params, $token = nul
551
551
552
552
$ params = array_merge ( $ params , $ oauth_params );
553
553
554
- $ base_request_uri = rawurlencode ( get_home_url ( null , parse_url ( $ _SERVER ['REQUEST_URI ' ], PHP_URL_PATH ) ) );
554
+ $ base_request_uri = get_home_url ( null , parse_url ( $ _SERVER ['REQUEST_URI ' ], PHP_URL_PATH ) );
555
555
556
556
// get the signature provided by the consumer and remove it from the parameters prior to checking the signature
557
557
$ consumer_signature = rawurldecode ( $ params ['oauth_signature ' ] );
@@ -567,7 +567,7 @@ protected function check_oauth_signature( $consumer, $oauth_params, $token = nul
567
567
$ query_string = $ this ->create_signature_string ( $ params );
568
568
569
569
$ token = (array ) $ token ;
570
- $ string_to_sign = $ http_method . '& ' . $ base_request_uri . '& ' . $ query_string ;
570
+ $ string_to_sign = $ http_method . '& ' . rawurlencode ( $ base_request_uri ) . '& ' . rawurlencode ( $ query_string ) ;
571
571
$ key_parts = array (
572
572
$ consumer ->secret ,
573
573
( $ token ? $ token ['secret ' ] : '' )
@@ -604,7 +604,7 @@ protected function check_oauth_signature( $consumer, $oauth_params, $token = nul
604
604
* @return string Signature string
605
605
*/
606
606
public function create_signature_string ( $ params ) {
607
- return implode ( '%26 ' , $ this ->join_with_equals_sign ( $ params ) ); // join with ampersand
607
+ return implode ( '& ' , $ this ->join_with_equals_sign ( $ params ) ); // join with ampersand
608
608
}
609
609
610
610
/**
@@ -624,8 +624,8 @@ public function join_with_equals_sign( $params, $query_params = array(), $key =
624
624
if ( $ key ) {
625
625
$ param_key = $ key . '[ ' . $ param_key . '] ' ; // Handle multi-dimensional array
626
626
}
627
- $ string = $ param_key . '= ' . $ param_value ; // join with equals sign
628
- $ query_params [] = urlencode ( $ string ) ;
627
+ $ string = rawurlencode ( $ param_key ) . '= ' . rawurlencode ( $ param_value ) ; // join with equals sign
628
+ $ query_params [] = $ string ;
629
629
}
630
630
}
631
631
return $ query_params ;
0 commit comments