From 65ac8cd858e73d1af1b93cfa9fe13ec9f01f177f Mon Sep 17 00:00:00 2001 From: alpianon <alberto@pianon.eu> Date: Wed, 20 Nov 2013 19:06:55 +0100 Subject: [PATCH] bux fix for custom upgrade streams line 199: in case of custom upgrade streams, variable $signature contains the last value from the foreach cycle at line 130, not the core schema signature! line 209: if we do not insert schema signatures for each custom stream, after install osTicket thinks it needs an upgrade and gets stuck (see function isUpgradePending() in class.ticket) --- setup/inc/class.installer.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/setup/inc/class.installer.php b/setup/inc/class.installer.php index fc514fd07..22f06ee03 100644 --- a/setup/inc/class.installer.php +++ b/setup/inc/class.installer.php @@ -196,7 +196,7 @@ class Installer extends SetupWizard { 'alert_email_id'=>$alert_email_id, 'default_dept_id'=>$dept_id_1, 'default_sla_id'=>$sla_id_1, 'default_timezone_id'=>$eastern_timezone, 'default_template_id'=>$template_id_1, 'admin_email'=>db_input($vars['admin_email']), - 'schema_signature'=>db_input($signature), + 'schema_signature'=>db_input($streams['core']), 'helpdesk_url'=>db_input(URL), 'helpdesk_title'=>db_input($vars['name'])); foreach ($defaults as $key=>$value) { @@ -205,6 +205,16 @@ class Installer extends SetupWizard { if(!db_query($sql, false)) $this->errors['err']='Unable to create config settings (#7)'; } + + foreach($streams as $stream=>$signature){ + if($stream!='core'){ + $sql='INSERT INTO '.PREFIX.'config (`namespace`, `key`, `value`, `updated`) ' + .'VALUES ('.db_input($stream).', '.db_input('schema_signature') + .', '.db_input($signature).', NOW())'; + if(!db_query($sql, false)) + $this->errors['err']='Unable to create config settings (#7)'; + } + } } if($this->errors) return false; //Abort on internal errors. -- GitLab