From 3ec730b71bdb3e2fe7d2ae8b0944730ee61ef8dd Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Wed, 30 Jun 2021 07:05:17 +0200 Subject: [PATCH] Standardise between different formShow pages --- Sccp_manager.class.php | 3 ++- views/formShow.php | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index b87a79b..63c052f 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -184,7 +184,8 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { 'form_prefix' => $form_prefix, 'fvalues' => $form_values, 'tftp_lang' => $this->tftpLang, - 'metainfo' => $this->sccp_metainfo + 'metainfo' => $this->sccp_metainfo, + 'sccp_defaults' => $this->sccpvalues ) ); } diff --git a/views/formShow.php b/views/formShow.php index e06aa9e..2c3183a 100644 --- a/views/formShow.php +++ b/views/formShow.php @@ -58,6 +58,9 @@ if (function_exists('music_list')) { if (!is_array($moh_list)) { $moh_list = array('default'); } +if (empty($fvalues)) { + $fvalues = $sccp_defaults; +} $items = $itm -> children();