From: Kurund Jalmi <kurund@civicrm.org>
Date: Mon, 6 May 2013 20:57:38 +0000 (-0700)
Subject: manually merged work on CRM-10592, #527
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=58d8ecd09ab6c09f22741af507a09fca99a2976d;p=civicrm-core.git

manually merged work on CRM-10592, #527
---

58d8ecd09ab6c09f22741af507a09fca99a2976d
diff --cc api/api.php
index dd79c69f59,00cb2ea3da..bb34ce37ba
--- a/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 0fce1b7ccf,255a9cf4c4..3918cbff0b
--- a/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/templates/listAll.tpl
index ef29f7a24a,f461779834..b0644813f3
--- a/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 *}