This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/mailchimp_campaign/mailchimp_campaign.module b/modules/mailchimp_campaign/mailchimp_campaign.module | |
index c781162..2eda7c7 100644 | |
--- a/modules/mailchimp_campaign/mailchimp_campaign.module | |
+++ b/modules/mailchimp_campaign/mailchimp_campaign.module | |
@@ -274,7 +274,7 @@ function mailchimp_campaign_list_templates($reset = FALSE) { | |
if ($chosen) { | |
$all_templates[$type] = array(); | |
- $response = $mc_templates->getTemplates(array('type' => $type)); | |
+ $response = $mc_templates->getTemplates(array('type' => $type, 'count' => 50)); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
Drupal::config('node.type.' . $node->bundle())->get(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ga_node_reports.pages.inc b/ga_node_reports.pages.inc | |
index f0eb797..8bc4426 100644 | |
--- a/ga_node_reports.pages.inc | |
+++ b/ga_node_reports.pages.inc | |
@@ -39,6 +39,13 @@ function ga_node_reports_view_node_report($node) { | |
// Chart details building. | |
$chart_date = $chart_page = $chart_session = array(); | |
+ // Sum up pageviews and sessions. | |
+ $sum = array('pageviews' => 0, 'sessions' => 0); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
php -d memory_limit=-1 /usr/local/bin/composer |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
function ds_get_field_value($key, $field, $entity, $entity_type, $bundle, $view_mode, $build = array()) { | |
// ………………… | |
// Track the display suite fields, that are in use. | |
$ds_fields = variable_get('my_active_ds_fields', array()); | |
$render_key = $entity_type . ' | ' . $bundle . ' | ' . $view_mode; | |
if (isset($ds_fields[$key])) { | |
if (!in_array($render_key, $ds_fields[$key]['used_in'])) { | |
$ds_fields[$key]['used_in'][] = $render_key; | |
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
function my_theme_preprocess_block(&$variables) { | |
// Make block_content contextual links available in Layout Builder blocks. | |
if(!empty($variables['content']['#block_content'])){ | |
if (empty($variables['title_suffix']) && isset($variables['elements']['content']['#contextual_links'])) { | |
$variables['title_suffix']['contextual_links'] = [ | |
'#type' => 'contextual_links_placeholder', | |
'#id' => _contextual_links_to_id($variables['elements']['content']['#contextual_links']), | |
]; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
drush eval "module_load_install('mymodule'); mymodule_update_8010();" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/Controller/GaNodeReportsCharts.php b/src/Controller/GaNodeReportsCharts.php | |
index 4d377f6..20bd319 100644 | |
--- a/src/Controller/GaNodeReportsCharts.php | |
+++ b/src/Controller/GaNodeReportsCharts.php | |
@@ -113,6 +113,14 @@ class GaNodeReportsCharts extends ControllerBase implements ContainerInjectionIn | |
// Chart details building. | |
$chart_date = $chart_page = $chart_session = []; | |
+ // Sum up pageviews and sessions. | |
+ // We process the results twice, to reduce the chance of patch conflicts. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/google_analytics_counter.info.yml b/google_analytics_counter.info.yml | |
index 661cd70..f032046 100644 | |
--- a/google_analytics_counter.info.yml | |
+++ b/google_analytics_counter.info.yml | |
@@ -4,6 +4,8 @@ description: 'Lightweight page view counter drawing on data collected by Google | |
# core: 8.x | |
package: Statistics | |
configure: google_analytics_counter.admin_settings_form | |
+dependencies: | |
+ - drupal:node |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/js/plugins/fixed_toolbar/plugin.js b/js/plugins/fixed_toolbar/plugin.js | |
index 4a0757c..fa51d2e 100644 | |
--- a/js/plugins/fixed_toolbar/plugin.js | |
+++ b/js/plugins/fixed_toolbar/plugin.js | |
@@ -8,6 +8,16 @@ CKEDITOR.plugins.add('fixed_toolbar', { | |
toolBar.style.position = 'sticky'; | |
// We use the same offset as Drupal uses for body to make up for Admin Toolbar. | |
toolBar.style.top = document.body.style.paddingTop; | |
+ | |
+ // Loop through the parents and see if we're in a modal. |