Merge pull request #14706 from ixiam/dev-SmartyCompiled

[civicrm-core.git] / CRM / Contact / Import / ImportJob.php

diff --git a/CRM/Contact/Import/ImportJob.php b/CRM/Contact/Import/ImportJob.php
index 565984708154bae98a9beeba1b7f39cf658c64e2..fff23875c7a71c0f3089d5a335794ce2e6b45dae 100644 (file)
--- a/CRM/Contact/Import/ImportJob.php
+++ b/CRM/Contact/Import/ImportJob.php
@@ -271,7 +271,7 @@ class CRM_Contact_Import_ImportJob {
       }
     }
 
-    if ($this->_newTagName || count($this->_tag)) {
+    if ($this->_newTagName || !empty($this->_tag)) {
       $tagAdditions = $this->_tagImportedContactsWithNewTag($contactIds,
         $this->_newTagName,
         $this->_newTagDesc
@@ -416,7 +416,7 @@ class CRM_Contact_Import_ImportJob {
     $result = CRM_Core_DAO::executeQuery($query, array($database));
     $incompleteImportTables = array();
     while ($importTable = $result->fetch()) {
-      if (!$this->isComplete($importTable)) {
+      if (!self::isComplete($importTable)) {
         $incompleteImportTables[] = $importTable;
       }
     }