Merge pull request #154 from WP-API/urlencode-arrays

Fix creating signature with arrays in the URL

Author: rmccue

lib/class-wp-rest-oauth1.php

@@ -662,7 +662,7 @@ public function check_oauth_signature( $consumer, $oauth_params, $token = null )
 		if ( substr( $request_path, 0, strlen( $wp_base ) ) === $wp_base ) {
 			$request_path = substr( $request_path, strlen( $wp_base ) );
 		}
-		$base_request_uri = rawurlencode( get_home_url( null, $request_path ) );
+		$base_request_uri = self::urlencode_rfc3986( get_home_url( null, $request_path ) );
 
 		// get the signature provided by the consumer and remove it from the parameters prior to checking the signature
 		$consumer_signature = rawurldecode( $params['oauth_signature'] );
@@ -733,10 +733,10 @@ public function join_with_equals_sign( $params, $query_params = array(), $key =
 				$query_params = $this->join_with_equals_sign( $param_value, $query_params, $param_key );
 			} else {
 				if ( $key ) {
-					$param_key = $key . '[' . $param_key . ']'; // Handle multi-dimensional array
+					$param_key = $key . '%5B' . $param_key . '%5D'; // Handle multi-dimensional array
 				}
 				$string = $param_key . '=' . $param_value; // join with equals sign
-				$query_params[] = urlencode( $string );
+				$query_params[] = self::urlencode_rfc3986($string );
 			}
 		}
 		return $query_params;
@@ -752,8 +752,8 @@ public function join_with_equals_sign( $params, $query_params = array(), $key =
 	 * @param string $value
 	 */
 	protected function normalize_parameters( &$key, &$value ) {
-		$key = rawurlencode( rawurldecode( $key ) );
-		$value = rawurlencode( rawurldecode( $value ) );
+		$key = self::urlencode_rfc3986( rawurldecode( $key ) );
+		$value = self::urlencode_rfc3986( rawurldecode( $value ) );
 	}
 
 	/**