CRM-17645 - More consistent function naming

[civicrm-core.git] / CRM / Core / DAO.php

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 43e88b961035ec9a671813dc6a34be110b667427..1fed8486c70c3d042b18c05a309f147fbc66b8f0 100644 (file)
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -2453,7 +2453,7 @@ SELECT contact_id
   }
 
   /**
-   * Generates clauses suitable for adding to WHERE or ON when doing an api.get for this entity
+   * Generates acl clauses suitable for adding to WHERE or ON when doing an api.get for this entity
    *
    * Return format is in the form of fieldname => clauses starting with an operator. e.g.:
    * @code
@@ -2466,7 +2466,7 @@ SELECT contact_id
    *
    * @return array
    */
-  public function apiWhereClause() {
+  public function addSelectWhereClause() {
     $clauses = array();
     $fields = $this->fields();
     $cidField = CRM_Utils_Array::value('contact_id', $fields);
@@ -2481,13 +2481,13 @@ SELECT contact_id
    * @param string $tableAlias
    * @return array
    */
-  public static function getAclClause($tableAlias = NULL) {
+  public static function getSelectWhereClause($tableAlias = NULL) {
     $bao = new static();
     if ($tableAlias === NULL) {
       $tableAlias = $bao->tableName();
     }
     $clauses = array();
-    foreach ((array) $bao->apiWhereClause() as $field => $vals) {
+    foreach ((array) $bao->addSelectWhereClause() as $field => $vals) {
       $clauses[$field] = NULL;
       if ($vals) {
         $clauses[$field] = "`$tableAlias`.`$field` " . implode(" AND `$tableAlias`.`$field` ", (array) $vals);