From a88e3fc1bd5958a89870cfe5dde11cef8d6df0c1 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@enhancesoft.com>
Date: Sun, 25 Feb 2018 22:22:14 +0000
Subject: [PATCH] Upgrader Fix: make it play nice with queue export
---
include/class.queue.php | 7 ++++++-
include/upgrader/streams/core/934b8db8-ad9d0a5f.task.php | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/include/class.queue.php b/include/class.queue.php
index 5c8057368..73089f78c 100644
--- a/include/class.queue.php
+++ b/include/class.queue.php
@@ -1094,7 +1094,12 @@ class CustomQueue extends VerySimpleModel {
return 0 === count($errors);
}
+ function psave() {
+ return parent::save();
+ }
+
function save($refetch=false) {
+
$nopath = !isset($this->path);
$path_changed = isset($this->dirty['parent_id']);
@@ -1166,7 +1171,7 @@ class CustomQueue extends VerySimpleModel {
static function __create($vars) {
$q = static::create($vars);
- $q->save();
+ $q->psave();
foreach ($vars['columns'] as $info) {
$glue = new QueueColumnGlue($info);
$glue->queue_id = $q->getId();
diff --git a/include/upgrader/streams/core/934b8db8-ad9d0a5f.task.php b/include/upgrader/streams/core/934b8db8-ad9d0a5f.task.php
index 7d48e4ea6..29a3a4b8c 100644
--- a/include/upgrader/streams/core/934b8db8-ad9d0a5f.task.php
+++ b/include/upgrader/streams/core/934b8db8-ad9d0a5f.task.php
@@ -30,7 +30,7 @@ class QueueSortCreator extends MigrationTask {
foreach ($open->getChildren() as $q) {
$q->flags |= CustomQueue::FLAG_INHERIT_SORTING;
- $q->save();
+ $q->psave();
}
// Set default queue to 'open'
--
GitLab