From fc10dcb8cb8d3e34069456eeacca808e13fe4112 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Thu, 23 Jul 2015 13:05:42 -0500
Subject: [PATCH] upgrade: Fix conversion of field hints
---
include/upgrader/streams/core/0d6099a6-98ad7d55.cleanup.sql | 2 +-
include/upgrader/streams/core/5cd0a25a-2d590ffa.task.php | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/upgrader/streams/core/0d6099a6-98ad7d55.cleanup.sql b/include/upgrader/streams/core/0d6099a6-98ad7d55.cleanup.sql
index 292d60528..87d968fc0 100644
--- a/include/upgrader/streams/core/0d6099a6-98ad7d55.cleanup.sql
+++ b/include/upgrader/streams/core/0d6099a6-98ad7d55.cleanup.sql
@@ -32,7 +32,7 @@ SET @s = (SELECT IF(
AND column_name = 'views'
) > 0,
"SELECT 1",
- "ALTER TABLE `%TABLE_PREFIX%faq` DROP `views`, DROP `score`;"
+ "ALTER TABLE `%TABLE_PREFIX%faq` DROP `views`, DROP `score`"
));
PREPARE stmt FROM @s;
EXECUTE stmt;
diff --git a/include/upgrader/streams/core/5cd0a25a-2d590ffa.task.php b/include/upgrader/streams/core/5cd0a25a-2d590ffa.task.php
index 7f529e727..34c59835b 100644
--- a/include/upgrader/streams/core/5cd0a25a-2d590ffa.task.php
+++ b/include/upgrader/streams/core/5cd0a25a-2d590ffa.task.php
@@ -6,6 +6,9 @@ class InstructionsPorter extends MigrationTask {
function run($max_time) {
foreach (DynamicForm::objects() as $F) {
$F->instructions = Format::htmlchars($F->get('instructions'));
+ $F->save();
+ }
+ foreach (DynamicFormField::objects() as $F){
$F->hint = Format::htmlchars($F->get('hint'));
$F->save();
}
--
GitLab