1 files changed, 8 insertions, 0 deletions
diff --git a/Net/OpenID/KVForm.php b/Net/OpenID/KVForm.php
index b372833..799f862 100644
--- a/Net/OpenID/KVForm.php
+++ b/Net/OpenID/KVForm.php
@@ -20,8 +20,16 @@
  */
 class Net_OpenID_KVForm {
     function arrayToKV($values) {
+        if ($values === null) {
+            return null;
+        }
+
         $serialized = '';
         foreach ($values as $key => $value) {
+            if (is_array($value)) {
+                list($key, $value) = $value;
+            }
+
             if (strpos($key, ':') !== FALSE) {
                 trigger_error('":" in key:' . addslashes($key),
                               E_USER_WARNING);