diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 4443d8c58e8a263b6e2a4b087f0a959486549964..4b7d47407a7be52d7f599bbd218258d0e726ef34 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,6 +1,11 @@
+WCM Base 7.x-1.x, 2016-08-03
+----------------------------
+-WCM Base: Updated Panopoly to 1.38.
+
WCM Base 7.x-1.x, 2016-07-27
----------------------------
-- WCM User Configuration: Add and configure userprotect module to prevent authenticated users (that are not editor or above) from editing their user profiles.
+- WCM User Configuration: Add and configure userprotect module to prevent
+ authenticated users (that are not editor or above) from editing their profiles.
WCM Base 7.x-1.x, 2016-07-26
----------------------------
diff --git a/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info b/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
index 024263b5362f5032f36f6ea3d485ea850ccd284b..bd506d7fd3b823ef3007eadd2dfee8b48dcc6fd5 100644
--- a/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
+++ b/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
@@ -3,8 +3,4 @@ description = "Provides a datepicker for the 'Authored on' field on node forms."
core = 7.x
files[] = date_popup_authored.test
package = Date/Time
-dependencies[] = date_popup
-; Information added by drush on 2012-06-16
-version = "7.x-1.1+2-dev"
-project = "date_popup_authored"
-datestamp = "1339821417"
\ No newline at end of file
+dependencies[] = date_popup
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/panels/PATCHES.txt b/profiles/wcm_base/modules/contrib/panels/PATCHES.txt
index fb586c4dc56ad121e9725a4353e073bc083079c0..683f0de60bd22d1cf508020ec66da676528e0541 100644
--- a/profiles/wcm_base/modules/contrib/panels/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/panels/PATCHES.txt
@@ -1,6 +1,5 @@
The following patches have been applied to this project:
- http://drupal.org/files/issues/2462331-7.patch
-- http://drupal.org/files/issues/2465193-1.patch
- http://drupal.org/files/issues/panelizer_is-1402860-82-fix-ipe-end-js-alert.patch
- http://drupal.org/files/issues/panels-ipe-workbench-block-2485837-1.patch
diff --git a/profiles/wcm_base/modules/contrib/panels/i18n_panels/i18n_panels.info b/profiles/wcm_base/modules/contrib/panels/i18n_panels/i18n_panels.info
index c52bf2675352ee8fef8788d0ce72a0ccb9bd7174..ac5b990c718ebc5c18bf65be935899f58edabcdb 100644
--- a/profiles/wcm_base/modules/contrib/panels/i18n_panels/i18n_panels.info
+++ b/profiles/wcm_base/modules/contrib/panels/i18n_panels/i18n_panels.info
@@ -7,9 +7,9 @@ dependencies[] = i18n_translation
package = Multilingual - Internationalization
core = 7.x
-; Information added by Drupal.org packaging script on 2016-03-29
-version = "7.x-3.5+22-dev"
+; Information added by Drupal.org packaging script on 2016-07-30
+version = "7.x-3.5+26-dev"
core = "7.x"
project = "panels"
-datestamp = "1459268950"
+datestamp = "1469854466"
diff --git a/profiles/wcm_base/modules/contrib/panels/panels.info b/profiles/wcm_base/modules/contrib/panels/panels.info
index 6d443ef22b0a11c3e48c44ab967835c3f5c0343e..ab993dcae91d8b90bc8f8fa9f7f84d2dbcb7372a 100644
--- a/profiles/wcm_base/modules/contrib/panels/panels.info
+++ b/profiles/wcm_base/modules/contrib/panels/panels.info
@@ -11,9 +11,9 @@ files[] = includes/legacy.inc
files[] = includes/plugins.inc
files[] = plugins/views/panels_views_plugin_row_fields.inc
-; Information added by Drupal.org packaging script on 2016-03-29
-version = "7.x-3.5+22-dev"
+; Information added by Drupal.org packaging script on 2016-07-30
+version = "7.x-3.5+26-dev"
core = "7.x"
project = "panels"
-datestamp = "1459268950"
+datestamp = "1469854466"
diff --git a/profiles/wcm_base/modules/contrib/panels/panels_ipe/js/panels_ipe.js b/profiles/wcm_base/modules/contrib/panels/panels_ipe/js/panels_ipe.js
index 46b1a253dfd78ed1b54e57d53a2c2502938a81b6..65a087afa377aa15d8308b57bdc86218464e7d10 100644
--- a/profiles/wcm_base/modules/contrib/panels/panels_ipe/js/panels_ipe.js
+++ b/profiles/wcm_base/modules/contrib/panels/panels_ipe/js/panels_ipe.js
@@ -230,7 +230,7 @@ function DrupalPanelsIPE(cache_key, cfg) {
// it clears out inline styles.
$('.panels-ipe-on').show();
ipe.showForm();
- ipe.topParent.addClass('panels-ipe-editing');
+ $('body').add(ipe.topParent).addClass('panels-ipe-editing');
};
diff --git a/profiles/wcm_base/modules/contrib/panels/panels_ipe/panels_ipe.info b/profiles/wcm_base/modules/contrib/panels/panels_ipe/panels_ipe.info
index b9a73c26603dc939fe10c2aabdb508c428f1276d..47f8bbbfc7d04f4c956fe96a5b0d40aa69d1aab2 100644
--- a/profiles/wcm_base/modules/contrib/panels/panels_ipe/panels_ipe.info
+++ b/profiles/wcm_base/modules/contrib/panels/panels_ipe/panels_ipe.info
@@ -7,9 +7,9 @@ core = 7.x
configure = admin/structure/panels
files[] = panels_ipe.module
-; Information added by Drupal.org packaging script on 2016-03-29
-version = "7.x-3.5+22-dev"
+; Information added by Drupal.org packaging script on 2016-07-30
+version = "7.x-3.5+26-dev"
core = "7.x"
project = "panels"
-datestamp = "1459268950"
+datestamp = "1469854466"
diff --git a/profiles/wcm_base/modules/contrib/panels/panels_mini/panels_mini.info b/profiles/wcm_base/modules/contrib/panels/panels_mini/panels_mini.info
index def3870e2f04b97d92a153a6fcceba4452b23d34..dde794b77d9acce76a86b8a9cf996942c2f8ca63 100644
--- a/profiles/wcm_base/modules/contrib/panels/panels_mini/panels_mini.info
+++ b/profiles/wcm_base/modules/contrib/panels/panels_mini/panels_mini.info
@@ -5,9 +5,9 @@ version = PANELS_VERSION
dependencies[] = panels
core = 7.x
files[] = plugins/export_ui/panels_mini_ui.class.php
-; Information added by Drupal.org packaging script on 2016-03-29
-version = "7.x-3.5+22-dev"
+; Information added by Drupal.org packaging script on 2016-07-30
+version = "7.x-3.5+26-dev"
core = "7.x"
project = "panels"
-datestamp = "1459268950"
+datestamp = "1469854466"
diff --git a/profiles/wcm_base/modules/contrib/panels/panels_mini/panels_mini.module b/profiles/wcm_base/modules/contrib/panels/panels_mini/panels_mini.module
index 21270e5e715249757dbeb3ad7c0d6fa8f7510a0e..4820f21a2f67e7b4ee2c2928f0f45b50de7379fb 100644
--- a/profiles/wcm_base/modules/contrib/panels/panels_mini/panels_mini.module
+++ b/profiles/wcm_base/modules/contrib/panels/panels_mini/panels_mini.module
@@ -147,6 +147,10 @@ function panels_mini_block_list_alter(&$blocks) {
if (module_exists('page_manager')) {
$current_page = page_manager_get_current_page();
}
+
+ // Load add at once to save time.
+ panels_mini_load_all();
+
foreach ($blocks as $key => $block) {
if ($block->module != 'panels_mini') {
// This block was added by a contrib module, leave it in the list.
@@ -255,23 +259,31 @@ function panels_mini_load($name) {
// We use array_key_exists because failed loads will be NULL and
// isset() will try to load it again.
if (!array_key_exists($name, $cache)) {
- ctools_include('export');
- $result = ctools_export_load_object('panels_mini', 'names', array($name));
- if (isset($result[$name])) {
- if (empty($result[$name]->display)) {
- $result[$name]->display = panels_load_display($result[$name]->did);
- if (!empty($result[$name]->title) && empty($result[$name]->display->title)) {
- $result[$name]->display->title = $result[$name]->title;
+ $cid = 'panels_mini_load:' . $name;
+ $result = cache_get($cid, 'cache_panels');
+ if (!empty($result->data)) {
+ $cache[$name] = $result->data;
+ }
+ else {
+ ctools_include('export');
+ $result = ctools_export_load_object('panels_mini', 'names', array($name));
+ if (isset($result[$name])) {
+ if (empty($result[$name]->display)) {
+ $result[$name]->display = panels_load_display($result[$name]->did);
+ if (!empty($result[$name]->title) && empty($result[$name]->display->title)) {
+ $result[$name]->display->title = $result[$name]->title;
+ }
+ }
+ $cache[$name] = $result[$name];
+ if (!empty($result[$name]->title) && empty($result[$name]->admin_title)) {
+ $cache[$name]->admin_title = $result[$name]->title;
}
+ cache_set($cid, $cache[$name], 'cache_panels', CACHE_TEMPORARY);
}
- $cache[$name] = $result[$name];
- if (!empty($result[$name]->title) && empty($result[$name]->admin_title)) {
- $cache[$name]->admin_title = $result[$name]->title;
+ else {
+ $cache[$name] = NULL;
}
}
- else {
- $cache[$name] = NULL;
- }
}
if (isset($cache[$name])) {
@@ -293,6 +305,25 @@ function panels_mini_load_all($reset = FALSE) {
if ($reset) {
$cache = array();
}
+ else {
+ $panel_names = db_select('panels_mini', 'pm')
+ ->fields('pm', array('name'))
+ ->execute();
+ $cids = array();
+ foreach ($panel_names as $name) {
+ $cids[] = 'panels_mini_load:' . $name->name;
+ }
+ if (empty($cids)) {
+ return array_filter($cache);
+ }
+ $output = cache_get_multiple($cids, 'cache_panels');
+ foreach ($output as $mini) {
+ if (!empty($mini->data)) {
+ $mini = $mini->data;
+ $cache[$mini->name] = $mini;
+ }
+ }
+ }
ctools_include('export');
$minis = ctools_export_load_object('panels_mini');
@@ -338,6 +369,9 @@ function panels_mini_save(&$mini) {
$mini->did = $display->did;
}
+ // Clear the panels_mini_load cache.
+ cache_clear_all('panels_mini_load:', 'cache_panels', TRUE);
+
$update = (isset($mini->pid) && $mini->pid != 'new') ? array('pid') : array();
drupal_write_record('panels_mini', $mini, $update);
diff --git a/profiles/wcm_base/modules/contrib/panels/panels_node/panels_node.info b/profiles/wcm_base/modules/contrib/panels/panels_node/panels_node.info
index 9ba652727b8174ee955d599ea8939e2bdd081816..69fb5f9ee5c6f15842509c57f9ff08a494527104 100644
--- a/profiles/wcm_base/modules/contrib/panels/panels_node/panels_node.info
+++ b/profiles/wcm_base/modules/contrib/panels/panels_node/panels_node.info
@@ -7,9 +7,9 @@ configure = admin/structure/panels
core = 7.x
files[] = panels_node.module
-; Information added by Drupal.org packaging script on 2016-03-29
-version = "7.x-3.5+22-dev"
+; Information added by Drupal.org packaging script on 2016-07-30
+version = "7.x-3.5+26-dev"
core = "7.x"
project = "panels"
-datestamp = "1459268950"
+datestamp = "1469854466"
diff --git a/profiles/wcm_base/modules/contrib/panels/panels_node/panels_node.module b/profiles/wcm_base/modules/contrib/panels/panels_node/panels_node.module
index 655932fb357685809a7fa60c3ff7df181a51ee71..03d8bbe382a7efd84adf30c23b8795b707176b43 100644
--- a/profiles/wcm_base/modules/contrib/panels/panels_node/panels_node.module
+++ b/profiles/wcm_base/modules/contrib/panels/panels_node/panels_node.module
@@ -231,7 +231,7 @@ function panels_node_hook_form(&$node, &$form_state) {
'#type' => 'radios',
'#options' => $options,
'#title' => t('Renderer'),
- '#default_value' => isset($node->panels_node['pipeline']) ? $node->panels_node['pipeline'] : 'standard',
+ '#default_value' => isset($node->panels_node['pipeline']) ? $node->panels_node['pipeline'] : variable_get('panels_renderer_default', 'standard'),
);
return $form;
diff --git a/profiles/wcm_base/modules/contrib/workbench/workbench.info b/profiles/wcm_base/modules/contrib/workbench/workbench.info
index 0e21b5f137ca20571c208a5b2a617676fd0e137f..d7cbf84f6369778823ff812cc8a73b4f01b89ced 100644
--- a/profiles/wcm_base/modules/contrib/workbench/workbench.info
+++ b/profiles/wcm_base/modules/contrib/workbench/workbench.info
@@ -4,8 +4,3 @@ package = Workbench
core = 7.x
configure = admin/config/workbench/settings
dependencies[] = views
-
-; Information added by drush on 2013-03-26
-version = "7.x-1.2"
-project = "workbench"
-datestamp = "1364314302"
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
index 118317e1f45b33854de12a8012ef803617b13a88..9eed11b0890ef272579ddb4f41cb6ca4aaae667e 100644
--- a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
+++ b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
@@ -4,8 +4,3 @@ package = Workbench
core = 7.x
dependencies[] = workbench
dependencies[] = media
-
-; Information added by drush on 2012-09-05
-version = "7.x-2.1"
-project = "workbench_media"
-datestamp = "1346862407"
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info b/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
index 497eb5783e2a39e8daa54ea1f6eaf5bb4d304182..0f9e0139939f90f05138f37fdc695d018263dee7 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
@@ -3,8 +3,3 @@ description = Test module for Workbench Moderation.
package = Workbench
core = 7.x
hidden = TRUE
-
-; Information added by drush on 2016-05-20
-version = "7.x-1.4+12-dev"
-project = "workbench_moderation"
-datestamp = "1463766238"
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
index ca15b2ef7dd7a8e8ba021f77e9a74dccf39c0371..3f9939f1b620392b86995547bbcbb4b94258075d 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
@@ -16,8 +16,3 @@ files[] = workbench_moderation.migrate.inc
files[] = tests/external_node_update.test
files[] = tests/workbench_moderation.test
files[] = tests/workbench_moderation.files.test
-
-; Information added by drush on 2016-05-20
-version = "7.x-1.4+12-dev"
-project = "workbench_moderation"
-datestamp = "1463766238"
\ No newline at end of file
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index 9992925a665b9e1b88b8b3f61e70e41129fb8f6a..70d738f04091af918d5bbd3dea637c63b87196c9 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -102,7 +102,6 @@ projects[override_node_options][subdir] = contrib
projects[panels][version] = 3.x-dev
projects[panels][subdir] = contrib
projects[panels][patch][2462331] = http://drupal.org/files/issues/2462331-7.patch
-projects[panels][patch][2465193] = http://drupal.org/files/issues/2465193-1.patch
projects[panels][patch][1402860] = http://drupal.org/files/issues/panelizer_is-1402860-82-fix-ipe-end-js-alert.patch
projects[panels][patch][2485837] = http://drupal.org/files/issues/panels-ipe-workbench-block-2485837-1.patch