Merge pull request #17207 from civicrm/5.25
authorSeamus Lee <seamuslee001@gmail.com>
Thu, 30 Apr 2020 22:33:14 +0000 (08:33 +1000)
committerGitHub <noreply@github.com>
Thu, 30 Apr 2020 22:33:14 +0000 (08:33 +1000)
5.25

1  2 
CRM/Api4/Page/Api4Explorer.php
ang/api4Explorer/Explorer.js

index 73545ea22d11eb6904601f4e6e73f2a2f462be35,e0d03bc8fb982edbef58487807690f98ec060286..c5280bb2573ebd292bb90ca704d780d17922006c
@@@ -24,9 -35,8 +33,9 @@@ class CRM_Api4_Page_Api4Explorer extend
        'operators' => \CRM_Core_DAO::acceptedSQLOperators(),
        'basePath' => Civi::resources()->getUrl('civicrm'),
        'schema' => (array) \Civi\Api4\Entity::get()->setChain(['fields' => ['$name', 'getFields']])->execute(),
-       'links' => (array) \Civi\Api4\Entity::getLinks()->execute(),
+       'links' => $entityLinks,
        'docs' => \Civi\Api4\Utils\ReflectionUtils::parseDocBlock($apiDoc->getDocComment()),
 +      'functions' => self::getSqlFunctions(),
        'groupOptions' => array_column((array) $groupOptions, 'options', 'name'),
      ];
      Civi::resources()
Simple merge