diff --git a/interface/forms/LBF/new.php b/interface/forms/LBF/new.php index 8b68786980c..1c86e59d855 100644 --- a/interface/forms/LBF/new.php +++ b/interface/forms/LBF/new.php @@ -930,7 +930,7 @@ function warehouse_changed(sel) { array($formname, $formid) ); $form_issue_id = empty($firow['issue_id']) ? 0 : intval($firow['issue_id']); - $default = empty($firow['provider_id']) ? $_SESSION['authUserID'] : intval($firow['provider_id']); + $default = empty($firow['provider_id']) ? ($_SESSION['authUserID'] ?? null) : intval($firow['provider_id']); if (!$patient_portal) { // Provider selector. @@ -1834,7 +1834,7 @@ function warehouse_changed(sel) {

- +

diff --git a/interface/patient_file/deleter.php b/interface/patient_file/deleter.php index 97d2e14fc07..57621a49bb0 100644 --- a/interface/patient_file/deleter.php +++ b/interface/patient_file/deleter.php @@ -169,6 +169,8 @@ function form_delete($formdir, $formid, $patient_id, $encounter_id) } row_delete("form_eye_mag_impplan", "form_id = '" . add_escape_custom($formid) . "'"); row_delete("form_eye_mag_wearing", "FORM_ID = '" . add_escape_custom($formid) . "'"); + } elseif ($formdir == 'form_HIS') { + // when history form is entered in portal, just ignore... } else { row_delete("form_$formdir", "id = '" . add_escape_custom($formid) . "'"); } diff --git a/portal/patient/fwk/libs/verysimple/Phreeze/Phreezable.php b/portal/patient/fwk/libs/verysimple/Phreeze/Phreezable.php index f9893acecb5..b1159fae0b5 100644 --- a/portal/patient/fwk/libs/verysimple/Phreeze/Phreezable.php +++ b/portal/patient/fwk/libs/verysimple/Phreeze/Phreezable.php @@ -410,7 +410,7 @@ private function _DoBaseValidation() if ($left > $limitLeft || $right > $limitRight) { $this->AddValidationError($prop, "$prop exceeds the maximum length of " . $fm->FieldSize . ""); } - } elseif (is_numeric($fm->FieldSize) && ($lenfunction($this->$prop) - 1 > $fm->FieldSize)) { + } elseif (is_numeric($fm->FieldSize) && ($lenfunction($this->$prop ?? '') - 1 > $fm->FieldSize)) { $this->AddValidationError($prop, "$prop exceeds the maximum length of " . $fm->FieldSize . ""); } diff --git a/portal/patient/fwk/libs/verysimple/Phreeze/Phreezer.php b/portal/patient/fwk/libs/verysimple/Phreeze/Phreezer.php index 9b230bf3d50..d97aa7cf0ed 100644 --- a/portal/patient/fwk/libs/verysimple/Phreeze/Phreezer.php +++ b/portal/patient/fwk/libs/verysimple/Phreeze/Phreezer.php @@ -557,7 +557,7 @@ public function Save($obj, $force_insert = false) $table = $fms [$pk]->TableName; $pkcol = $fms [$pk]->ColumnName; $returnval = ""; - $pk_is_auto_insert = strlen($id) == 0; + $pk_is_auto_insert = strlen($id ?? '') == 0; // if there is no value for the primary key, this is an insert $is_insert = $force_insert || $pk_is_auto_insert; // fire the OnSave event in case the object needs to prepare itself