From aa5ba569131852ab8292782763046a4642bf750d Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Mon, 11 Mar 2013 20:19:16 -0700 Subject: [PATCH] Move .permissions.php and .listAll.php --- .gitignore | 4 ++-- CRM/Core/DAO/{.permissions.php => permissions.php} | 0 CRM/Utils/Hook.php | 2 +- api/api.php | 2 +- api/v3/utils.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename CRM/Core/DAO/{.permissions.php => permissions.php} (100%) diff --git a/.gitignore b/.gitignore index ac1b2bf1e1..cac09cf0f4 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,7 @@ CRM/Contact/DAO/RelationshipType.php CRM/Contact/DAO/SavedSearch.php CRM/Contact/DAO/SubscriptionHistory.php CRM/Contribute/DAO -CRM/Core/DAO/.listAll.php +CRM/Core/DAO/listAll.php CRM/Core/DAO/ActionLog.php CRM/Core/DAO/ActionMapping.php CRM/Core/DAO/ActionSchedule.php @@ -145,4 +145,4 @@ l10n vendor civicrm.settings.php sql/dummy_processor.mysql -distmaker/distmaker.conf \ No newline at end of file +distmaker/distmaker.conf diff --git a/CRM/Core/DAO/.permissions.php b/CRM/Core/DAO/permissions.php similarity index 100% rename from CRM/Core/DAO/.permissions.php rename to CRM/Core/DAO/permissions.php diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php index b318ac02a3..044fb0fd16 100644 --- a/CRM/Utils/Hook.php +++ b/CRM/Utils/Hook.php @@ -877,7 +877,7 @@ abstract class CRM_Utils_Hook { /** * This hook is called when API permissions are checked (cf. civicrm_api3_api_check_permission() - * in api/v3/utils.php and _civicrm_api3_permissions() in CRM/Core/DAO/.permissions.php). + * in api/v3/utils.php and _civicrm_api3_permissions() in CRM/Core/DAO/permissions.php). * * @param string $entity the API entity (like contact) * @param string $action the API action (like get) diff --git a/api/api.php b/api/api.php index 16b3e30391..4f3bf9c408 100644 --- a/api/api.php +++ b/api/api.php @@ -533,7 +533,7 @@ function _civicrm_api_get_entity_name_from_camel($entity) { function _civicrm_api_get_entity_name_from_dao($bao){ $daoName = str_replace("BAO", "DAO", get_class($bao)); $dao = array(); - require ('CRM/Core/DAO/.listAll.php'); + require ('CRM/Core/DAO/listAll.php'); $daos = array_flip($dao); return _civicrm_api_get_entity_name_from_camel($daos[$daoName]); diff --git a/api/v3/utils.php b/api/v3/utils.php index 8181f4248a..7a38ff89ef 100644 --- a/api/v3/utils.php +++ b/api/v3/utils.php @@ -270,7 +270,7 @@ function _civicrm_api3_load_DAO($entity) { function _civicrm_api3_get_DAO($name) { static $dao = NULL; if (!$dao) { - require ('CRM/Core/DAO/.listAll.php'); + require ('CRM/Core/DAO/listAll.php'); } if (strpos($name, 'civicrm_api3') !== FALSE) { @@ -904,7 +904,7 @@ function _civicrm_api3_api_check_permission($entity, $action, &$params, $throw = require_once 'CRM/Core/Permission.php'; - require_once 'CRM/Core/DAO/.permissions.php'; + require_once 'CRM/Core/DAO/permissions.php'; $permissions = _civicrm_api3_permissions($entity, $action, $params); // $params might’ve been reset by the alterAPIPermissions() hook -- 2.25.1