Merge from 1.0.x

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

diff --git a/classes/Login_token.php b/classes/Login_token.php
index 3733af66cf6baafe56bb13f6ffe4797cc50a78f5..7049c7c7fee651c94e510711d284aac325ca9e5d 100644 (file)
--- a/classes/Login_token.php
+++ b/classes/Login_token.php
@@ -58,19 +58,6 @@ class Login_token extends Managed_DataObject
 
     const TIMEOUT = 120; // seconds after which to timeout the token
 
-    /*
-    DB_DataObject calculates the sequence key(s) by taking the first key returned by the keys() function.
-    In this case, the keys() function returns user_id as the first key. user_id is not a sequence, but
-    DB_DataObject's sequenceKey() will incorrectly think it is. Then, since the sequenceKey() is a numeric
-    type, but is not set to autoincrement in the database, DB_DataObject will create a _seq table and
-    manage the sequence itself. This is not the correct behavior for the user_id in this class.
-    So we override that incorrect behavior, and simply say there is no sequence key.
-    */
-    function sequenceKey()
-    {
-        return array(false,false);
-    }
-
     function makeNew($user)
     {
         $login_token = Login_token::staticGet('user_id', $user->id);