From b67c445c53d58a6d36098aa85a6b6dea8e85080b Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 28 Mar 2016 23:15:04 -0500
Subject: [PATCH] oops: Fix upgrade crashes
---
include/class.orm.php | 2 +-
include/class.translation.php | 2 +-
include/upgrader/streams/core/36f6b328-5cd0a25a.task.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/class.orm.php b/include/class.orm.php
index fbbdf7f11..2d4938d95 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 2e864b393..2d503baf6 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 e7d11a856..fceebeae5 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`) '
--
GitLab