Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-21-15-52-41

Conflicts:
	CRM/Contribute/BAO/ContributionPage.php
	CRM/Core/Resources.php

diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge

diff --cc CRM/Contribute/BAO/ContributionPage.php
index 1b4df7e00c9473508524aaa371000595f346b074,5c426b9464cbc43ae85403deedf7135417c53404..5d86d79a4a6d44d3d3f61031f47a77e03ad81c2a
--- 1/CRM/Contribute/BAO/ContributionPage.php
--- 2/CRM/Contribute/BAO/ContributionPage.php
+++ b/CRM/Contribute/BAO/ContributionPage.php
@@@ -797,9 -837,11 +797,10 @@@ LEFT JOIN  civicrm_premiums            
     *
     * @return array|string
     */
 -  public static function formatMultilingualHonorParams($params, $setDefault = FALSE) {
 +  public static function formatModuleData($params, $setDefault = FALSE, $module) {
+     global $tsLocale;
      $config = CRM_Core_Config::singleton();
 -
 -    $sctJson = $sctJsonDecode = NULL;
 +    $json = $jsonDecode = NULL;
      $domain = new CRM_Core_DAO_Domain();
      $domain->find(TRUE);
  
@@@ -822,21 -848,20 +823,21 @@@
      //When we are fetching the honor params respecting both multi and mono lingual state
      //and setting it to default param of Contribution Page's Main and Setting form
      if ($setDefault) {
 -      $sctJsonDecode = json_decode($params);
 -      $sctJsonDecode = (array) $sctJsonDecode->soft_credit;
 -      if (!$domain->locales && !empty($sctJsonDecode['default'])) {
 +      $jsonDecode = json_decode($params);
 +      $jsonDecode = (array) $jsonDecode->$module;
 +      if (!$domain->locales && !empty($jsonDecode['default'])) {
          //monolingual state
 -        $sctJsonDecode += (array) $sctJsonDecode['default'];
 +        $jsonDecode += (array) $jsonDecode['default'];
 +        unset($jsonDecode['default']);
        }
-       elseif (!empty($jsonDecode[$config->lcMessages])) {
 -      elseif (!empty($sctJsonDecode[$tsLocale])) {
++      elseif (!empty($jsonDecode[$tsLocale])) {
          //multilingual state
-         foreach ($jsonDecode[$config->lcMessages] as $column => $value) {
 -        foreach ($sctJsonDecode[$tsLocale] as $column => $value) {
 -          $sctJsonDecode[$column] = $value;
++        foreach ($jsonDecode[$tsLocale] as $column => $value) {
 +          $jsonDecode[$column] = $value;
          }
-         unset($jsonDecode[$config->lcMessages]);
 -        unset($sctJsonDecode[$tsLocale]);
++        unset($jsonDecode[$tsLocale]);
        }
 -      return $sctJsonDecode;
 +      return $jsonDecode;
      }
  
      //check and handle multilingual honoree params

diff --cc CRM/Core/Resources.php
index 11fd31f002cf6554d823b5231b9e7571a4011c83,3b5bff76496fa84be33ab72ff2a8cc3660df1f16..f1d39f4de51edf8ac34f87a082aeb525cce732d7
--- 1/CRM/Core/Resources.php
--- 2/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@@ -733,10 -719,10 +733,10 @@@ class CRM_Core_Resources 
  
      // These scripts are only needed by back-office users
      if (CRM_Core_Permission::check('access CiviCRM')) {
 -      $items[] = "packages/jquery/plugins/jquery.menu$min.js";
 +      $items[] = "packages/jquery/plugins/jquery.menu.min.js";
-       $items[] = "css/navigation.css";
+       $items[] = "css/civicrmNavigation.css";
 -      $items[] = "packages/jquery/plugins/jquery.jeditable$min.js";
 -      $items[] = "packages/jquery/plugins/jquery.notify$min.js";
 +      $items[] = "packages/jquery/plugins/jquery.jeditable.min.js";
 +      $items[] = "packages/jquery/plugins/jquery.notify.min.js";
        $items[] = "js/jquery/jquery.crmeditable.js";
      }
  

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

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

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

diff --cc templates/CRM/Price/Form/PriceSet.tpl
Simple merge

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