diff -r 65c8d1bfe94b -r 0a723ff3d27c app/soc/logic/models/site.py
--- a/app/soc/logic/models/site.py	Sat Jan 31 15:40:32 2009 +0000
+++ b/app/soc/logic/models/site.py	Sat Jan 31 15:41:45 2009 +0000
@@ -42,7 +42,7 @@
 
     super(Logic, self).__init__(model=model, base_model=base_model)
 
-  def getKeyValues(self, entity):
+  def getKeyValuesFromEntity(self, entity):
     """Returns the key values for the site settings.
 
     The Site entity is a singleton, so this method returns 
@@ -78,7 +78,12 @@
   def getSingleton(self):
     """Return singleton Site settings entity, since there is always only one.
     """
-    return self.getFromFields(link_id=self.DEF_SITE_LINK_ID)
+
+    fields = {
+        'link_id': self.DEF_SITE_LINK_ID,
+        }
+
+    return self.getFromKeyFields(fields)
 
 
 logic = Logic()