Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-05-17-16-30

Conflicts:
	tests/phpunit/api/v3/GroupContactTest.php

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

diff --cc CRM/Contact/BAO/Query.php
index 69e4a22e4adc10f5bd7468f37868d8d019cb3730,d108d6eaa906410aa09e39c4ad2f2ba733e7a25a..7cd5c8ae1cd9920e1006659cdef3a9621be5c3a8
--- 1/CRM/Contact/BAO/Query.php
--- 2/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@@ -757,35 -754,14 +752,17 @@@ class CRM_Contact_BAO_Query 
                  }
                  elseif ($fieldName != 'id') {
                    if ($fieldName == 'prefix_id') {
-                     // Hack - profile views use different field name than normal views!
-                     $this->_pseudoConstantsSelect['prefix_id'] =
-                     $this->_pseudoConstantsSelect['individual_prefix'] = array(
-                       'pseudoField' => 'prefix_id',
-                       'idCol' => "prefix_id",
-                       'bao' => 'CRM_Contact_BAO_Contact'
-                     );
+                     $this->_pseudoConstantsSelect['individual_prefix'] = array('pseudoField' => 'prefix_id', 'idCol' => "prefix_id", 'bao' => 'CRM_Contact_BAO_Contact');
                    }
                    if ($fieldName == 'suffix_id') {
-                     // Hack - profile views use different field name than normal views!
-                     $this->_pseudoConstantsSelect['suffix_id'] =
-                     $this->_pseudoConstantsSelect['individual_suffix'] = array(
-                       'pseudoField' => 'suffix_id',
-                       'idCol' => "suffix_id",
-                       'bao' => 'CRM_Contact_BAO_Contact'
-                     );
+                     $this->_pseudoConstantsSelect['individual_suffix'] = array('pseudoField' => 'suffix_id', 'idCol' => "suffix_id", 'bao' => 'CRM_Contact_BAO_Contact');
                    }
                    if ($fieldName == 'gender_id') {
-                     // Hack - profile views use different field name than normal views!
-                     $this->_pseudoConstantsSelect['gender_id'] =
-                     $this->_pseudoConstantsSelect['gender'] = array(
-                       'pseudoField' => 'gender_id',
-                       'idCol' => "gender_id",
-                       'bao' => 'CRM_Contact_BAO_Contact'
-                     );
+                     $this->_pseudoConstantsSelect['gender'] = array('pseudoField' => 'gender_id', 'idCol' => "gender_id", 'bao' => 'CRM_Contact_BAO_Contact');
                    }
 +                  if ($name == 'communication_style_id') {
 +                    $this->_pseudoConstantsSelect['communication_style'] = array('pseudoField' => 'communication_style_id', 'idCol' => "communication_style_id", 'bao' => 'CRM_Contact_BAO_Contact');
 +                  }
                    $this->_select[$name] = "contact_a.{$fieldName}  as `$name`";
                  }
                }

diff --cc CRM/Core/BAO/ActionSchedule.php
Simple merge

diff --cc CRM/Core/Config.php
Simple merge

diff --cc CRM/Core/DAO.php
Simple merge

diff --cc CRM/Core/Page.php
Simple merge

diff --cc CRM/Event/xml/Menu/Event.xml
Simple merge

diff --cc CRM/Mailing/Form/Group.php
Simple merge

diff --cc CRM/Profile/Selector/Listings.php
Simple merge

diff --cc CRM/Report/Form.php
Simple merge

diff --cc CRM/Report/Form/Case/Demographics.php
Simple merge

diff --cc CRM/Report/Form/Event/ParticipantListCount.php
Simple merge

diff --cc CRM/Utils/System/Drupal.php
Simple merge

diff --cc CRM/Utils/Token.php
Simple merge

diff --cc api/api.php
Simple merge

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

diff --cc tests/phpunit/api/v3/GroupContactTest.php
index 299e0abaaff038ba11eab62ad1644d96801db9c8,ef31e3b50d8c10086202f64d14c678fcd382d401..a3c118b463d5a710b218da94b2f7d8317ab5b05b
--- 1/tests/phpunit/api/v3/GroupContactTest.php
--- 2/tests/phpunit/api/v3/GroupContactTest.php
+++ b/tests/phpunit/api/v3/GroupContactTest.php
@@@ -70,7 -70,11 +70,7 @@@ class api_v3_GroupContactTest extends C
        'visibility' => 'User and User Admin Only',
      );
  
-     $this->_groupId2 = $this->groupCreate($group, 3);
+     $this->_groupId2 = $this->groupCreate($group);
 -    $params = array(
 -      'contact_id.1' => $this->_contactId,
 -      'group_id' => $this->_groupId2,
 -    );
  
      $this->_group = array(
        $this->_groupId1 => array('title' => 'New Test Group Created',

diff --cc tests/phpunit/api/v3/SyntaxConformanceTest.php
Simple merge

diff --cc xml/schema/Activity/ActivityContact.xml
Simple merge

diff --cc xml/schema/Core/Website.xml
Simple merge