Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba

[friendica.git] / include / user.php

diff --git a/include/user.php b/include/user.php
index cd77707dd0bbc602cf2cad59beab1d572aebe9da..08719cd7c135feb9f27090f984c801f46c9f47b2 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -175,17 +175,7 @@ function create_user($arr) {
        $prvkey = $keys['prvkey'];
        $pubkey = $keys['pubkey'];
 
-       /**
-        *
-        * Create another keypair for signing/verifying
-        * salmon protocol messages. We have to use a slightly
-        * less robust key because this won't be using openssl
-        * but the phpseclib. Since it is PHP interpreted code
-        * it is not nearly as efficient, and the larger keys
-        * will take several minutes each to process.
-        *
-        */
-
+       // Create another keypair for signing/verifying salmon protocol messages.
        $sres    = new_keypair(512);
        $sprvkey = $sres['prvkey'];
        $spubkey = $sres['pubkey'];
@@ -236,9 +226,7 @@ function create_user($arr) {
        );
        if ((dbm::is_result($r)) && (count($r) > 1) && $newuid) {
                $result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
-               q("DELETE FROM `user` WHERE `uid` = %d",
-                       intval($newuid)
-               );
+               dba::delete('user', array('uid' => $newuid));
                return $result;
        }
 
@@ -258,8 +246,7 @@ function create_user($arr) {
                if ($r === false) {
                        $result['message'] .=  t('An error occurred creating your default profile. Please try again.') . EOL;
                        // Start fresh next time.
-                       $r = q("DELETE FROM `user` WHERE `uid` = %d",
-                               intval($newuid));
+                       dba::delete('user', array('uid' => $newuid));
                        return $result;
                }