Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / classes / Consumer.php

diff --git a/classes/Consumer.php b/classes/Consumer.php
index 01bde457e5f7490116cda9adec7a69ddac99edd0..68e973bfb095bcfe55180c539026856b04c1f087 100644 (file)
--- a/classes/Consumer.php
+++ b/classes/Consumer.php
@@ -38,7 +38,7 @@ class Consumer extends Managed_DataObject
     static function generateNew()
     {
         $cons = new Consumer();
-        $rand = common_good_rand(16);
+        $rand = common_random_hexstr(16);
 
         $cons->seed            = $rand;
         $cons->consumer_key    = md5(time() + $rand);
@@ -54,14 +54,14 @@ class Consumer extends Managed_DataObject
      * XXX: Should this happen in an OAuthDataStore instead?
      *
      */
-    function delete()
+    function delete($useWhere=false)
     {
         // XXX: Is there any reason NOT to do this kind of cleanup?
 
         $this->_deleteTokens();
         $this->_deleteNonces();
 
-        parent::delete();
+        return parent::delete($useWhere);
     }
 
     function _deleteTokens()