Remove usage of nullArray

diff --git a/CRM/Contact/Import/Form/DataSource.php b/CRM/Contact/Import/Form/DataSource.php
index 2a7b1839e67f0ed711717aa5c13ebbb0ad00987d..81ec461669152af00b1f9db28ab74bae4f6ece64 100644 (file)
--- 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 2f55cea32c37c20e9a75092b28fe092f94c7d82e..95427c78a719b50ebead24cf2b1c60ab354ccd12 100644 (file)
--- 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;