colepacak

diff --git a/includes/ckeditor.lib.inc b/includes/ckeditor.lib.inc
index e2395f3..6a93b4b 100644
--- a/includes/ckeditor.lib.inc
+++ b/includes/ckeditor.lib.inc
@@ -889,14 +889,8 @@ function ckeditor_profile_settings_compile($global_profile, $profile) {
     $settings['loadPlugins'] = ckeditor_plugins_render($conf['loadPlugins']);

     if (array_key_exists('media', $settings['loadPlugins']) && module_exists('media')) {
-      module_load_include('inc', 'media', 'includes/media.browser');
-      $javascript = media_browser_js();

colepacak

diff --git a/chosen_ajax.module b/chosen_ajax.module
index 5b2f460..c0cf4ba 100644
--- a/chosen_ajax.module
+++ b/chosen_ajax.module
@@ -109,7 +109,7 @@ function chosen_ajax_field_widget_form_alter(&$element, &$form_state, $context)
  * Helper function to update element recursively.
  */
 function chosen_ajax_field_widget_apply_recursive(&$element, $settings) {
-  if (isset($element['#chosen'])) {
+  if (!empty($element['#chosen']) && $element['#chosen']) {

colepacak

diff --git a/modules/user/user.module b/modules/user/user.module
index b239799..acb57b6 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -3877,16 +3877,17 @@ function user_register_submit($form, &$form_state) {
 
   // New administrative account without notification.
   $uri = entity_uri('user', $account);
+
   if ($admin && !$notify) {

colepacak

diff --git a/google_recaptcha.admin.inc b/google_recaptcha.admin.inc
index 04e8545..cf0952e 100644
--- a/google_recaptcha.admin.inc
+++ b/google_recaptcha.admin.inc
@@ -205,6 +205,9 @@ function g_forms($form, &$form_state) {
       }
     }
   }
+  if (module_exists('aact_membership_process')) {
+    $available_forms['aact_membership_process_join_register_form'] = t('AACT Membership Process - User Registration');

colepacak

diff --git a/modules/commerce_billy_pdf/commerce_billy_pdf.module b/modules/commerce_billy_pdf/commerce_billy_pdf.module
index bb9a13d..8af41b0 100644
--- a/modules/commerce_billy_pdf/commerce_billy_pdf.module
+++ b/modules/commerce_billy_pdf/commerce_billy_pdf.module
@@ -49,7 +49,7 @@ function commerce_billy_pdf_view_access($order) {
   if ($order->status == 'canceled' && user_access('administer commerce_order entities')) {
     return TRUE;
   }
-  elseif ($order->status != 'invoiced') {
+  elseif ($order->status != 'invoiced' && $order->status != 'checkout_checkout') {

colepacak

diff --git a/modules/commerce_billy_pdf/commerce_billy_pdf.module b/modules/commerce_billy_pdf/commerce_billy_pdf.module
index 8af41b0..abe546d 100644
--- a/modules/commerce_billy_pdf/commerce_billy_pdf.module
+++ b/modules/commerce_billy_pdf/commerce_billy_pdf.module
@@ -200,6 +200,22 @@ function commerce_billy_pdf_commerce_order_view($order, $view_mode) {
     $order->content['invoice_logo'] = array(
       '#value' => variable_get('commerce_billy_pdf_logo', 'misc/druplicon.png'),
     );
+    // Get civicrm contact off of membership line item
+    $line_items = $order->commerce_line_items;

colepacak

diff --git a/chosen_ajax.module b/chosen_ajax.module
index 5b2f460..ff7a7d9 100644
--- a/chosen_ajax.module
+++ b/chosen_ajax.module
@@ -146,7 +146,14 @@ function chosen_ajax_theme_registry_alter(&$theme_registry) {
 function chosen_ajax_theme_textfield($variables) {
   $element = $variables['element'];
   if (!isset($element['#chosen_ajax'])) {
-    return theme_textfield($variables);
+    if (

colepacak

diff --git a/theme/views-data-export-csv-header.tpl.php b/theme/views-data-export-csv-header.tpl.php
index e40a1bf..9fe4424 100644
--- a/theme/views-data-export-csv-header.tpl.php
+++ b/theme/views-data-export-csv-header.tpl.php
@@ -2,5 +2,8 @@
 
 // Print out header row, if option was selected.
 if ($options['header']) {
+    // Begin file with UTF-8 BOM.
+    print ("\xEF\xBB\xBF");

colepacak

diff --git a/plugins/views_plugin_query_default.inc b/plugins/views_plugin_query_default.inc
index 8a15e8d..03183ba 100644
--- a/plugins/views_plugin_query_default.inc
+++ b/plugins/views_plugin_query_default.inc
@@ -1195,10 +1195,16 @@ class views_plugin_query_default extends views_plugin_query {
 
       if (!empty($field['function'])) {
         $info = $this->get_aggregation_info();
-        if (!empty($info[$field['function']]['method']) && function_exists($info[$field['function']]['method'])) {
-          $string = $info[$field['function']]['method']($field['function'], $string);

colepacak

{
  "name": "favish/demo",
  "description": "demo",
  "type": "project",
  "minimum-stability": "stable",
  "prefer-stable": true,
  "config": {
    "preferred-install": "dist",
    "autoloader-suffix": "Drupal8"
  },