From: Seamus Lee <seamuslee001@gmail.com>
Date: Thu, 30 Apr 2020 22:33:14 +0000 (+1000)
Subject: Merge pull request #17207 from civicrm/5.25
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=900b31a6945e218aa51342130a20210f8b289fd7;p=civicrm-core.git

Merge pull request #17207 from civicrm/5.25

5.25
---

900b31a6945e218aa51342130a20210f8b289fd7
diff --cc CRM/Api4/Page/Api4Explorer.php
index 73545ea22d,e0d03bc8fb..c5280bb257
--- a/CRM/Api4/Page/Api4Explorer.php
+++ b/CRM/Api4/Page/Api4Explorer.php
@@@ -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()