Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-03-11-26-36

Conflicts:
	CRM/Core/BAO/CustomQuery.php
	CRM/Core/Resources.php
	sql/civicrm_generated.mysql

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

diff --cc CRM/Contact/BAO/GroupContactCache.php
Simple merge

diff --cc CRM/Contact/BAO/Query.php
Simple merge

diff --cc CRM/Contact/Form/Search/Advanced.php
index e82ae6bf3573b6de0e2b557f9cc2ad86b367a6ed,86b127dc02d78b97866530dd83dd356c619ca32b..32742bcc842bd9b2e9f6cf5ff68f00c95b9876ee
--- 1/CRM/Contact/Form/Search/Advanced.php
--- 2/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@@ -377,11 -377,7 +377,10 @@@ class CRM_Contact_Form_Search_Advanced 
        'activity_type_id',
        'status_id',
        'activity_subject',
 +      'contribution_page_id',
 +      'contribution_product_id',
 +      'payment_instrument_id',
      );
-     $specialParams += preg_grep('/^custom_/', array_keys($this->_formValues));
      foreach ($specialParams as $element) {
        $value = CRM_Utils_Array::value($element, $this->_formValues);
        if ($value) {

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

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

diff --cc CRM/Core/BAO/CustomQuery.php
index 66ea07484463146978e67388bfc5cadced41b1d1,37b00ab57c85fb0d88f882253b63b2af5ce60901..108e675eeee34bfc9589a0819c9b06c72d252c9e
--- 1/CRM/Core/BAO/CustomQuery.php
--- 2/CRM/Core/BAO/CustomQuery.php
+++ b/CRM/Core/BAO/CustomQuery.php
@@@ -409,17 -413,11 +413,21 @@@ SELECT label, valu
                if (!is_array($value)) {
                  $value = CRM_Utils_Type::escape($strtolower($value), 'String');
                }
-               elseif ($isSerialized && strstr($op, 'IN')) {
 +              // in api sometimes params is in array('sqlOp' => (mixed)'values') format
 +              elseif (!empty($value) && in_array(key($value), CRM_Core_DAO::acceptedSQLOperators(), TRUE) || strstr(key($value), 'EMPTY')) {
 +                $op = key($value);
 +                $qillOp = CRM_Utils_Array::value($op, CRM_Core_SelectValues::getSearchBuilderOperators(), $op);
 +                $value = CRM_Utils_Type::escape($strtolower($value[$op]), 'String');
 +              }
 +
 +              if (strstr($op, 'NULL') || strstr($op, 'EMPTY')) {
 +                $qillValue = $value = NULL;
 +              }
+               elseif ($isSerialized) {
+                 if (in_array(key($value), CRM_Core_DAO::acceptedSQLOperators(), TRUE)) {
+                   $op = key($value);
+                   $value = $value[$op];
+                 }
                  $value = implode(',', $value);
                }
  

diff --cc CRM/Core/Resources.php
index e422547419b3e99b7e9b212affa459593cfee42b,e1663fc7bf0509c3237b7f3f457ec6bd0c3f75ef..44eca40ccdbaa10e6b3fee4d9c11a33ef4081ace
--- 1/CRM/Core/Resources.php
--- 2/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@@ -582,17 -587,14 +582,17 @@@ class CRM_Core_Resources 
  
        // Add resources from coreResourceList
        $jsWeight = -9999;
-       foreach ($this->coreResourceList() as $item) {
 -      foreach ($this->coreResourceList($region) as $file) {
 -        if (substr($file, -2) == 'js') {
++      foreach ($this->coreResourceList($region) as $item) {
 +        if (is_array($item)) {
 +          $this->addSetting($item);
 +        }
 +        elseif (substr($item, -2) == 'js') {
            // Don't bother  looking for ts() calls in packages, there aren't any
 -          $translate = (substr($file, 0, 3) == 'js/');
 -          $this->addScriptFile('civicrm', $file, $jsWeight++, $region, $translate);
 +          $translate = (substr($item, 0, 3) == 'js/');
 +          $this->addScriptFile('civicrm', $item, $jsWeight++, $region, $translate);
          }
          else {
 -          $this->addStyleFile('civicrm', $file, -100, $region);
 +          $this->addStyleFile('civicrm', $item, -100, $region);
          }
        }
  
@@@ -683,12 -685,14 +683,13 @@@
    /**
     * List of core resources we add to every CiviCRM page.
     *
 +   * Note: non-compressed versions of .min files will be used in debug mode
 +   *
+    * @param string $region
     * @return array
     */
-   public function coreResourceList() {
+   public function coreResourceList($region) {
      $config = CRM_Core_Config::singleton();
 -    // Use minified files for production, uncompressed in debug mode
 -    // Note, $this->addScriptFile would automatically search for the non-minified file in debug mode but this is probably faster
 -    $min = $config->debug ? '' : '.min';
  
      // Scripts needed by everyone, everywhere
      // FIXME: This is too long; list needs finer-grained segmentation

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

diff --cc js/Common.js
Simple merge

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

diff --cc xml/templates/civicrm_navigation.tpl
Simple merge