Reversing array merge to avoid overwrites of default headers

firebase · Jun 18, 2015 · 37feebf · 37feebf
1 parent abc1f5b
commit 37feebf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Authentication/JWT.php b/Authentication/JWT.php
@@ -132,7 +132,7 @@ public static function encode($payload, $key, $alg = 'HS256', $keyId = null, $he
             $header['kid'] = $keyId;
         }
         if ( isset($head) && is_array($head) ) {
-            $header = array_merge($header, $head);
+            $header = array_merge($head, $header);
         }
         $segments = array();
         $segments[] = JWT::urlsafeB64Encode(JWT::jsonEncode($header));