X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=inline;f=CRM%2FExtension%2FMapper.php;h=fd828e4fe771e54a8a85776317fdf969e521ba48;hb=8b056441a3578c3e29f545865cbc951ddaa740c0;hp=358d3a9103233a37b5d8494f561de53f0298efb7;hpb=d48669c33083785178028c56352f2c1e839829a4;p=civicrm-core.git

diff --git a/CRM/Extension/Mapper.php b/CRM/Extension/Mapper.php
index 358d3a9103..fd828e4fe7 100644
--- a/CRM/Extension/Mapper.php
+++ b/CRM/Extension/Mapper.php
@@ -275,9 +275,9 @@ class CRM_Extension_Mapper {
    *   array(array('prefix' => $, 'file' => $))
    */
   public function getActiveModuleFiles($fresh = FALSE) {
-    $config = CRM_Core_Config::singleton();
-    if ($config->isUpgradeMode() || !defined('CIVICRM_DSN')) {
-      return []; // hmm, ok
+    if (!defined('CIVICRM_DSN')) {
+      // hmm, ok
+      return [];
     }
 
     $moduleExtensions = NULL;
@@ -286,6 +286,8 @@ class CRM_Extension_Mapper {
     }
 
     if (!is_array($moduleExtensions)) {
+      $compat = CRM_Extension_System::getCompatibilityInfo();
+
       // Check canonical module list
       $moduleExtensions = [];
       $sql = '
@@ -296,6 +298,9 @@ class CRM_Extension_Mapper {
       ';
       $dao = CRM_Core_DAO::executeQuery($sql);
       while ($dao->fetch()) {
+        if (!empty($compat[$dao->full_name]['force-uninstall'])) {
+          continue;
+        }
         try {
           $moduleExtensions[] = [
             'prefix' => $dao->file,