From 8acc1587b1cd4f6fc78bbedb88f414cd18efa942 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 25 Nov 2009 13:38:59 -0800
Subject: Revert "Allow plugin DB_DataObject classes to not have to use the
 .ini file by overriding keys(), table(), and sequenceKey() for them"

This reverts commit a373d07ae00b878f47970f2e4a7d86c6ec3a65cf.

Conflicts:

	classes/statusnet.ini
	lib/schema.php
	plugins/Authentication/AuthenticationPlugin.php
	plugins/OpenID/OpenIDPlugin.php
	plugins/UserFlag/UserFlagPlugin.php
---
 classes/statusnet.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'classes/statusnet.ini')

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 69b355870..b2509dac5 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -261,7 +261,6 @@ modified = 384
 
 [login_token__keys]
 user_id = K
-token = K
 
 [message]
 id = 129
@@ -543,4 +542,4 @@ created = 142
 modified = 384
 
 [user_group__keys]
-id = N
+id = N
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf