Merge branch 'hotfix' of github.com:NETivism/netiCRM into hotfix

NETivism · Aug 22, 2024 · 0be4d3b · 0be4d3b
2 parents b118000 + ea63a74
commit 0be4d3b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
@@ -549,7 +549,7 @@ function selectClause() {
 
       // if this is a hierarchical name, we ignore it
       $names = explode('-', $name);
-      if (is_array($name) && count($names > 1) && isset($names[1]) && is_numeric($names[1])) {
+      if (is_array($name) && count($names) > 1 && isset($names[1]) && is_numeric($names[1])) {
         continue;
       }
 
@@ -3854,6 +3854,7 @@ static function &defaultReturnProperties($mode = self::MODE_CONTACTS) {
           'legal_name' => 1,
           'sic_code' => 1,
           'current_employer' => 1,
+          'current_employer_id' => 1,
           // FIXME: should we use defaultHierReturnProperties() for the below?
           'do_not_email' => 1,
           'do_not_mail' => 1,

diff --git a/CRM/SMS/Form/Provider.php b/CRM/SMS/Form/Provider.php
@@ -198,8 +198,8 @@ public function setDefaultValues() {
    * Process the form submission.
    */
   public function postProcess() {
-
     CRM_Utils_System::flushCache('CRM_SMS_DAO_Provider');
+    CRM_Core_BAO_Cache::deleteGroup('SMS Provider');
 
     if ($this->_action & CRM_Core_Action::DELETE) {
       CRM_SMS_BAO_Provider::del($this->_id);

diff --git a/CRM/SMS/Page/Provider.php b/CRM/SMS/Page/Provider.php
@@ -129,7 +129,6 @@ public function run() {
    * @param array $action
    */
   public function browse($action = NULL) {
-    CRM_Core_BAO_Cache::deleteGroup('SMS Provider');
     $providers = CRM_SMS_BAO_Provider::getProviders();
     $rows = array();
     foreach ($providers as $provider) {