Merge branch '1.0.x' into testing

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

diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php
index 35d52c51208f6949c31672d3d18dbc175d06949b..7263b3e3206f787c6116599f43f1a2e1e489c7aa 100644 (file)
--- a/classes/Managed_DataObject.php
+++ b/classes/Managed_DataObject.php
@@ -68,7 +68,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
 
     function sequenceKey()
     {
-        $table = self::schemaDef();
+        $table = call_user_func(array(get_class($this), 'schemaDef'));
         foreach ($table['fields'] as $name => $column) {
             if ($column['type'] == 'serial') {
                 // We have a serial/autoincrement column.
@@ -92,8 +92,8 @@ abstract class Managed_DataObject extends Memcached_DataObject
 
     function keyTypes()
     {
+        $table = call_user_func(array(get_class($this), 'schemaDef'));
         $keys = array();
-        $table = self::schemaDef();
 
         if (!empty($table['unique keys'])) {
             foreach ($table['unique keys'] as $idx => $fields) {