diff --git a/include/class.orm.php b/include/class.orm.php index fbbdf7f1127f930f2221402b3a055e8cbe712021..2d4938d9586adb239f5ba043b9395e75b68b867d 100644 --- a/include/class.orm.php +++ b/include/class.orm.php @@ -1453,7 +1453,7 @@ implements IteratorAggregate, Countable, ArrayAccess { function asArray() { $this->fillTo(PHP_INT_MAX); - return $this; + return $this->getCache(); } function getCache() { diff --git a/include/class.translation.php b/include/class.translation.php index 2e864b39383fd0dc26b4244eb4f68e304eb532d8..2d503baf654697a0be78d8371b7a614cd095a00f 100644 --- a/include/class.translation.php +++ b/include/class.translation.php @@ -1033,7 +1033,7 @@ class CustomDataTranslation extends VerySimpleModel { $criteria['lang'] = $lang; try { - return static::objects()->filter($criteria)->all(); + return static::objects()->filter($criteria)->all()->asArray(); } catch (OrmException $e) { // Translation table might not exist yet — happens on the upgrader diff --git a/include/upgrader/streams/core/36f6b328-5cd0a25a.task.php b/include/upgrader/streams/core/36f6b328-5cd0a25a.task.php index e7d11a8561aa0105bac141ac882799842db919e6..fceebeae510017da054dba5c19134b48816ddf73 100644 --- a/include/upgrader/streams/core/36f6b328-5cd0a25a.task.php +++ b/include/upgrader/streams/core/36f6b328-5cd0a25a.task.php @@ -28,7 +28,7 @@ class TaskLoader extends MigrationTask { foreach ($sequences as $s) { if ($s['id'] != 2) continue; unset($s['id']); - $sq=Sequence::create($s); + $sq=new Sequence($s); $sq->save(); $sql= 'INSERT INTO '.CONFIG_TABLE .' (`namespace`, `key`, `value`) '