switch password and id in munge_password

[quix0rs-gnu-social.git] / lib / openid.php

diff --git a/lib/openid.php b/lib/openid.php
index 48c2a6cb1a64e6b72faa03b38b4a73174d5bff10..74d7d64a9d2adfa922bb34ad9462022a23774952 100644 (file)
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -50,12 +50,16 @@ function oid_link_user($id, $canonical, $display) {
        $oid->canonical = $canonical;
        $oid->display = $display;
        $oid->created = DB_DataObject_Cast::dateTime();
-               
+
+    common_debug('oid = '.print_r($oid, TRUE), __FILE__);
+       
        if (!$oid->insert()) {
                $err = PEAR::getStaticProperty('DB_DataObject','lastError');
                common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
                return false;
        }
+
+    common_debug('oid = '.print_r($oid, TRUE), __FILE__);
        
        return true;
 }
@@ -95,7 +99,7 @@ function oid_authenticate($openid_url, $returnto) {
                $auth_request->addExtension($sreg_request);
        }
        
-       $trust_root = common_local_url($public);
+       $trust_root = common_local_url('public');
        $process_url = common_local_url($returnto);
        
        if ($auth_request->shouldSendRedirect()) {