manually merged work on CRM-10592, #527

diff --cc api/api.php
index dd79c69f59365775d7a8f93fe3635df409d54f29,00cb2ea3da77ee912205a01610acf43258a34205..bb34ce37bab5bf694a0ab7fd9a2e1e53ff730f9a
--- 1/api/api.php
--- 2/api/api.php
+++ b/api/api.php
@@@ -534,10 -540,10 +534,9 @@@ function _civicrm_api_get_entity_name_f
   */
  function _civicrm_api_get_entity_name_from_dao($bao){
    $daoName = str_replace("BAO", "DAO", get_class($bao));
-   return _civicrm_api_get_entity_name_from_camel(CRM_Core_AllCoreTables::getFullName($daoName));
+   return _civicrm_api_get_entity_name_from_camel(CRM_Core_DAO_AllCoreTables::getFullName($daoName));
  }
  
--
  /**
   * Sets the tsLocale and dbLocale for multi-lingual sites.
   * Some code duplication from CRM/Core/BAO/ConfigSetting.php retrieve()

diff --cc api/v3/utils.php
index 0fce1b7ccf6a2a253e0bace65665d08ae583e8ff,255a9cf4c40a978f1e1353a712cc53d16dc448b4..3918cbff0b3cdbdbfa4392afd528ccda860ae808
--- 1/api/v3/utils.php
--- 2/api/v3/utils.php
+++ b/api/v3/utils.php
@@@ -300,8 -300,8 +300,7 @@@ function _civicrm_api3_get_DAO($name) 
      return 'CRM_Core_BAO_IM';
    }
  
--
-   return CRM_Core_AllCoreTables::getFullName(_civicrm_api_get_camel_name($name, 3));
+   return CRM_Core_DAO_AllCoreTables::getFullName(_civicrm_api_get_camel_name($name, 3));
  }
  
  /**

diff --cc xml/GenCode.php
Simple merge

diff --cc xml/templates/listAll.tpl
index ef29f7a24a4d74e18668b9cd8bd4c54369449076,f46177983444ddc6013e1ead37b593f5ca8e34c3..b0644813f34fba25258094e8880bd3acc6cae9b1
--- 1/xml/templates/listAll.tpl
--- 2/xml/templates/listAll.tpl
+++ b/xml/templates/listAll.tpl
@@@ -42,7 -42,7 +42,8 @@@ class CRM_Core_DAO_AllCoreTables {ldeli
  {/foreach} {* tables *}
    );
  
-   static protected $daoToClass = array(
+   static $daoToClass = array(
++
  {foreach from=$tables item=table}
      '{$table.objectName}' => '{$table.className}',
  {/foreach} {* tables *}