Merge pull request #14010 from colemanw/assetCheck

Skip adding core resources when building assets
civicrm · Apr 14, 2019 · e8e6e75 · e8e6e75
2 parents 2e47b4f + 60c3b6e
commit e8e6e75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
@@ -821,8 +821,8 @@ public static function isAjaxMode() {
     ) {
       return TRUE;
     }
-    $url = CRM_Utils_System::getUrlPath();
-    return (strpos($url, 'civicrm/ajax') === 0) || (strpos($url, 'civicrm/angular') === 0);
+    list($arg0, $arg1) = array_pad(explode('/', CRM_Utils_System::getUrlPath()), 2, '');
+    return ($arg0 === 'civicrm' && in_array($arg1, ['ajax', 'angularprofiles', 'asset']));
   }
 
   /**

diff --git a/tests/phpunit/CRM/Core/ResourcesTest.php b/tests/phpunit/CRM/Core/ResourcesTest.php
@@ -350,6 +350,7 @@ public function ajaxModeData() {
     return array(
       array(array('q' => 'civicrm/ajax/foo'), TRUE),
       array(array('q' => 'civicrm/angularprofiles/template'), TRUE),
+      array(array('q' => 'civicrm/asset/builder'), TRUE),
       array(array('q' => 'civicrm/test/page'), FALSE),
       array(array('q' => 'civicrm/test/page', 'snippet' => 'json'), TRUE),
       array(array('q' => 'civicrm/test/page', 'snippet' => 'foo'), FALSE),