From b6ba2bbbfbb852e7323868d9bf31d57cd2c125e4 Mon Sep 17 00:00:00 2001
From: drishu <mr.drishu@gmail.com>
Date: Fri, 6 Mar 2020 15:25:05 +0000
Subject: [PATCH 1/4] NEPT-2709: Fix undefined function current_path in
 registry rebuild.

---
 .../features/cce_basic_config/cce_basic_config.module        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/profiles/common/modules/features/cce_basic_config/cce_basic_config.module b/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
index e43866b0ab..763186a463 100644
--- a/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
+++ b/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
@@ -533,6 +533,7 @@ function cce_basic_config_js_alter(&$javascript) {
  */
 function cce_basic_config_query_alter(QueryAlterableInterface $query) {
   global $user;
+  $path = '';
 
   if ($user->uid == 1) {
     return;
@@ -540,8 +541,8 @@ function cce_basic_config_query_alter(QueryAlterableInterface $query) {
 
   $path = current_path();
 
-  if ($path !== 'admin/people') {
-    return;
+  if (function_exists('current_path')) {
+    $path = current_path();
   }
 
   $tables = &$query->getTables();

From a9b220a277c0b4eb9cea6578fc0dedd7ae5ebf70 Mon Sep 17 00:00:00 2001
From: drishu <mr.drishu@gmail.com>
Date: Fri, 6 Mar 2020 15:26:13 +0000
Subject: [PATCH 2/4] NEPT-2709: Fix undefined function current_path in
 registry rebuild.

---
 .../features/cce_basic_config/cce_basic_config.module       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/profiles/common/modules/features/cce_basic_config/cce_basic_config.module b/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
index 763186a463..f275c47aac 100644
--- a/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
+++ b/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
@@ -539,12 +539,14 @@ function cce_basic_config_query_alter(QueryAlterableInterface $query) {
     return;
   }
 
-  $path = current_path();
-
   if (function_exists('current_path')) {
     $path = current_path();
   }
 
+  if ($path !== 'admin/people') {
+    return;
+  }
+
   $tables = &$query->getTables();
 
   if (isset($tables['u']) && isset($tables['u']['table']) && $tables['u']['table'] == 'users') {

From 69f3373c380f042edebb6fb607c7de3abd4b6071 Mon Sep 17 00:00:00 2001
From: drishu <mr.drishu@gmail.com>
Date: Mon, 9 Mar 2020 10:36:39 +0000
Subject: [PATCH 3/4] NEPT-2709: Refactoring fix.

---
 .../features/cce_basic_config/cce_basic_config.module    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/profiles/common/modules/features/cce_basic_config/cce_basic_config.module b/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
index f275c47aac..140b0e8df1 100644
--- a/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
+++ b/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
@@ -533,15 +533,12 @@ function cce_basic_config_js_alter(&$javascript) {
  */
 function cce_basic_config_query_alter(QueryAlterableInterface $query) {
   global $user;
-  $path = '';
 
-  if ($user->uid == 1) {
+  if ($user->uid == 1 || !function_exists('current_path')) {
     return;
   }
-
-  if (function_exists('current_path')) {
-    $path = current_path();
-  }
+  
+  $path = current_path();
 
   if ($path !== 'admin/people') {
     return;

From cfefe20d6fd0cb0134656f3db857a99f9b61f8ec Mon Sep 17 00:00:00 2001
From: drishu <mr.drishu@gmail.com>
Date: Mon, 9 Mar 2020 10:37:34 +0000
Subject: [PATCH 4/4] NEPT-2709: Refactoring fix.

---
 .../modules/features/cce_basic_config/cce_basic_config.module   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/common/modules/features/cce_basic_config/cce_basic_config.module b/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
index 140b0e8df1..258760cf8f 100644
--- a/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
+++ b/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
@@ -537,7 +537,7 @@ function cce_basic_config_query_alter(QueryAlterableInterface $query) {
   if ($user->uid == 1 || !function_exists('current_path')) {
     return;
   }
-  
+
   $path = current_path();
 
   if ($path !== 'admin/people') {