From 54c321379c2718c7ca864440f0b07ed8bd2b5ce8 Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 24 Jul 2019 16:26:56 +1200 Subject: [PATCH] Remove usage of nullArray --- CRM/Contact/Import/Form/DataSource.php | 7 ++++--- CRM/Utils/Request.php | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CRM/Contact/Import/Form/DataSource.php b/CRM/Contact/Import/Form/DataSource.php index 2a7b1839e6..81ec461669 100644 --- a/CRM/Contact/Import/Form/DataSource.php +++ b/CRM/Contact/Import/Form/DataSource.php @@ -46,6 +46,8 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Core_Form { /** * Set variables up before form is built. + * + * @throws \CRM_Core_Exception */ public function preProcess() { @@ -88,12 +90,11 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Core_Form { } $this->_dataSourceIsValid = FALSE; - $this->_dataSource = CRM_Utils_Request::retrieve( + $this->_dataSource = CRM_Utils_Request::retrieveValue( 'dataSource', 'String', - CRM_Core_DAO::$_nullObject, - FALSE, NULL, + FALSE, 'GET' ); diff --git a/CRM/Utils/Request.php b/CRM/Utils/Request.php index 2f55cea32c..95427c78a7 100644 --- a/CRM/Utils/Request.php +++ b/CRM/Utils/Request.php @@ -215,6 +215,7 @@ class CRM_Utils_Request { * Where to look for the value - GET|POST|REQUEST * * @return mixed + * @throws \CRM_Core_Exception */ public static function retrieveValue($name, $type, $defaultValue = NULL, $isRequired = FALSE, $method = 'REQUEST') { $null = NULL; -- 2.25.1