From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 19 Nov 2015 02:12:30 +0000 (-0500)
Subject: Merge branch '4.6' into master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d5e5f8438fe2777954f815731e1422c367624bea;p=civicrm-core.git

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
---

d5e5f8438fe2777954f815731e1422c367624bea
diff --cc CRM/Case/Form/Search.php
index be49117664,e5c7918a8f..8c6b2acd31
--- a/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 install/index.php
index c70deebe32,8f8303dff0..3c954df829
--- a/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 tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
index afb77efc0f,c5930a68f6..3f22d75cc8
--- a/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"));