Merge branch '4.6' into master

Conflicts:
	CRM/Case/Form/Search.php
	tests/phpunit/WebTest/Contribute/PCPAddTest.php
	tests/phpunit/WebTest/Member/InheritedMembershipTest.php
	tests/phpunit/WebTest/Member/OnlineMembershipRenewTest.php

diff --cc CRM/Case/Form/Search.php
index be4911766414057c47061d12ef0c17a18d5ab083,e5c7918a8fa1d3655edb5f911fbd08f8948e0b4f..8c6b2acd31e636698370aaa20de25c69de6e4a7b
--- 1/CRM/Case/Form/Search.php
--- 2/CRM/Case/Form/Search.php
+++ b/CRM/Case/Form/Search.php
@@@ -372,8 -383,8 +372,8 @@@ class CRM_Case_Form_Search extends CRM_
        CRM_Core_DAO::$_nullObject
      );
      if ($caseType) {
-       $this->_formValues['case_type_id'][$caseType] = $caseType;
-       $this->_defaults['case_type_id'][$caseType] = $caseType;
 -      $this->_formValues['case_type_id'] = $caseType;
 -      $this->_defaults['case_type_id'] = $caseType;
++      $this->_formValues['case_type_id'] = (array) $caseType;
++      $this->_defaults['case_type_id'] = (array) $caseType;
      }
  
      $caseFromDate = CRM_Utils_Request::retrieve('pstart', 'Date',

diff --cc CRM/Contact/Form/DedupeRules.php
Simple merge

diff --cc CRM/Dedupe/Finder.php
Simple merge

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

diff --cc install/index.php
index c70deebe328dfa83a00293c7d60937868a971b32,8f8303dff0b32575f1fb8e7672c4282bab772249..3c954df829697ea6e4cb7e1573bd293d4b345fd5
--- 1/install/index.php
--- 2/install/index.php
+++ b/install/index.php
@@@ -103,19 -76,16 +103,19 @@@ require_once $crmPath . '/CRM/Core/Clas
  CRM_Core_ClassLoader::singleton()->register();
  
  // Load civicrm database config
- if (isset($_REQUEST['mysql'])) {
-   $databaseConfig = $_REQUEST['mysql'];
+ if (isset($_POST['mysql'])) {
+   $databaseConfig = $_POST['mysql'];
  }
  else {
 -  $databaseConfig = array(
 -    "server" => "localhost",
 -    "username" => "civicrm",
 -    "password" => "",
 -    "database" => "civicrm",
 -  );
 +  if ($installType == 'wordpress') {
 +    //WP Database Data
 +    $databaseConfig = array(
 +      "server" => DB_HOST,
 +      "username" => DB_USER,
 +      "password" => DB_PASSWORD,
 +      "database" => DB_NAME,
 +    );
 +  }
  }
  
  if ($installType == 'drupal') {

diff --cc templates/CRM/Admin/Page/APIExplorer.js
Simple merge

diff --cc tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Case/CaseDashboardTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Contact/DupeContactTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Contribute/PCPAddTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Event/AddEventTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Event/ParticipantSearchTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Member/InheritedMembershipTest.php
Simple merge

diff --cc tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
index afb77efc0f294dad659437bde17e7f866df40173,c5930a68f65f16775c90db7c0bcf5161f86f9b15..3f22d75cc86907b776a8818e44873ef815f00dc8
--- 1/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
--- 2/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
+++ b/tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
@@@ -201,9 -201,9 +201,9 @@@ class WebTest_Member_OfflineMembershipR
      $this->waitForElementPresent("xpath=//table[@class='display dataTable no-footer']/tbody/tr/td[9]/span/a[contains(text(), 'View')]");
  
      // click through to the membership view screen
 -
 +    $this->waitForAjaxContent();
      $this->click("xpath=//table[@class='display dataTable no-footer']/tbody/tr/td[9]/span/a[contains(text(), 'View')]");
-     $this->waitForElementPresent("xpath=//button//span[contains(text(),'Done')]");
+     $this->waitForElementPresent("_qf_MembershipView_cancel-bottom");
  
      $joinDate = date('F jS, Y');
      $startDate = date('F jS, Y', strtotime("+1 month"));