Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-18-07-54-54

Conflicts:
	CRM/Utils/Hook/Joomla.php
	api/v3/examples/LocBlock/Create.php
	api/v3/examples/LocBlock/CreateEntities.php
	api/v3/examples/LocBlock/Get.php
	api/v3/examples/LocBlock/createEntities.php
	api/v3/examples/LocBlock/getEntities.php
	api/v3/examples/LocBlock/simpleCreate.php
	api/v3/examples/LocBlockCreate.php
	api/v3/examples/LocBlockCreateEntities.php
	api/v3/examples/LocBlockGet.php

diff --cc CRM/Activity/BAO/Activity.php
Simple merge

diff --cc CRM/Contribute/Form/Contribution/Main.php
Simple merge

diff --cc CRM/Export/BAO/Export.php
index 51e62e483311e4bffeb567a7d41cb21beeef538c,e0648cdd57604ddc538cf4c357dceb19cd958a96..442aa6c3f011621a0680131a43b9157cb2418b03
--- 1/CRM/Export/BAO/Export.php
--- 2/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@@ -833,8 -834,9 +833,9 @@@ INSERT INTO {$componentTable} SELECT di
                  // FIXME: We should not be using labels as keys!
                  $daoField = CRM_Utils_String::munge($ltype) . '-' . $type[0];
  
 -                if (CRM_Utils_Array::value(1, $type)) {
 +                if (!empty($type[1])) {
                    $fldValue .= "-" . $type[1];
+                   $daoField .= "-" . $type[1];
                  }
  
                  // CRM-3157: localise country, region (both have ‘country’ context) and state_province (‘province’ context)

diff --cc CRM/Friend/BAO/Friend.php
Simple merge

diff --cc CRM/Friend/Form/Contribute.php
Simple merge

diff --cc CRM/Friend/Form/Event.php
Simple merge

diff --cc CRM/Utils/Hook/Joomla.php
Simple merge

diff --cc api/v3/Activity.php
Simple merge

diff --cc api/v3/examples/LocBlock/createEntities.php
Simple merge

diff --cc api/v3/utils.php
index 850d566609bf4557538310ff894da81ae326d358,8737a0a6dd9645baabbc3447e5a6e6561d4f750b..76adc47b68e1292de2fccf6960c61122659779d1
--- 1/api/v3/utils.php
--- 2/api/v3/utils.php
+++ b/api/v3/utils.php
@@@ -780,12 -761,15 +780,15 @@@ function _civicrm_api3_get_unique_name_
   * @static void
   * @access public
   */
- function _civicrm_api3_dao_to_array($dao, $params = NULL, $uniqueFields = TRUE, $entity = "") {
+ function _civicrm_api3_dao_to_array($dao, $params = NULL, $uniqueFields = TRUE, $entity = "", $autoFind = TRUE) {
    $result = array();
 -  if(isset($params['options']) && CRM_Utils_Array::value('is_count', $params['options'])) {
 +  if(isset($params['options']) && !empty($params['options']['is_count'])) {
      return $dao->count();
    }
-   if (empty($dao) || !$dao->find()) {
+   if (empty($dao)) {
+     return array();
+   }
+   if ($autoFind && !$dao->find()) {
      return array();
    }
  

diff --cc css/civicrm.css
Simple merge

diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge