Merge pull request #12921 from colemanw/ajaxMode

Fix isAjaxMode to also recognize angular ajax
civicrm · Nov 6, 2018 · 9ea9527 · 9ea9527
2 parents 4589b6e + e83561b
commit 9ea9527
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
@@ -788,7 +788,8 @@ public static function isAjaxMode() {
     ) {
       return TRUE;
     }
-    return strpos(CRM_Utils_System::getUrlPath(), 'civicrm/ajax') === 0;
+    $url = CRM_Utils_System::getUrlPath();
+    return (strpos($url, 'civicrm/ajax') === 0) || (strpos($url, 'civicrm/angular') === 0);
   }
 
   /**

diff --git a/tests/phpunit/CRM/Core/ResourcesTest.php b/tests/phpunit/CRM/Core/ResourcesTest.php
@@ -339,6 +339,7 @@ public function testIsAjaxMode($query, $result) {
   public function ajaxModeData() {
     return array(
       array(array('q' => 'civicrm/ajax/foo'), TRUE),
+      array(array('q' => 'civicrm/angularprofiles/template'), 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),