Skip to content
This repository has been archived by the owner on Jul 6, 2020. It is now read-only.

Updating XML Sitemap to 7.x-2.4 #2801

Merged
merged 14 commits into from Aug 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 28 additions & 1 deletion modules/contrib/bean/CHANGELOG.TXT
Expand Up @@ -3,8 +3,34 @@ Current API VERSION: 5.
Bean 7.x-1.x-dev, xxxx-xx-xx
----------------------------

Bean 7.x-1.10, 2016-08-03
Bean 7.x-1.13, 2018-08-09
----------------------------
#2843416 by jordanclague: Undefined index for title and label when no beans in use
#2857677 by badjava, DamienMcKenna, skwashd: Revision UUIDs are not unique using bean_uuid
#2780717 by Grayle: Sorting by title but showing only labels
#2732035 by james.williams, Samvel: Static cache in bean_load_delta unclearable
#2084823 by timodwhit, Delphine Lepers, dxvargas, Samvel, Pol: contextual links for entity view
#2375291 by kyletaylored: Allow the view mode to be controlled in
bean_view_page().
#2734693 by joseph.olstad, Fabianx, krlucas, sylus: Add persistent caching to
bean_block_info() to avoid loading all beans at run-time when using Panels /
CTools content type block plugin.
#2894054 by DamienMcKenna: Undefined index: type in DevelContribGeneratorDefault
->createEntity().
#2894053 by DamienMcKenna: Add support for Devel (Contrib) Generate.
#2940081 by DamienMcKenna: Clean up existing tests.

Bean 7.x-1.12, 2018-08-09
----------------------------
Bad release.

Bean 7.x-1.11, 2016-08-08
-------------------------
Reverted: #2527008 by axel.rutz: Display cache breaks bean display


Bean 7.x-1.10, 2016-08-03
-------------------------
#2527008 by axel.rutz: Display cache breaks bean display.
#2465267 by brantwynn: Bean insists we use a tagged release of Entity API and
that's simply not happening.
Expand All @@ -23,6 +49,7 @@ Bean 7.x-1.10, 2016-08-03
#2459041 by jsacksick: Use bean_access as access callback for block/add/(type)
#2267391 by freality: Bean properties display as improper type in Views


Bean 7.x-1.9, 2015-03-03
------------------------
#1821136 by stefan.r, delzhand, vflirt, rsmylski, recrit, ultimateboy, kris84:
Expand Down
7 changes: 7 additions & 0 deletions modules/contrib/bean/README.txt
Expand Up @@ -51,3 +51,10 @@ Easily convert Boxes to Beans: https://github.com/skwashd/bean_boxes
Views without Views: http://thinkshout.com/blog/2012/06/sean/introducing-relevant-content-bean
Bean Intro: http://previousnext.com.au/blog/introduction-bean-module
Extending An Already Defined Bean: http://drupal.org/node/1826204

Related modules
---------------
* Devel Contrib
https://www.drupal.org/project/devel_contrib
Includes a Devel Contrib Generate submodule which adds Devel Generate support
to any supported entity, including Bean.
23 changes: 15 additions & 8 deletions modules/contrib/bean/bean.info
@@ -1,6 +1,12 @@
name = Bean
description = Create Bean (Block Entities)
core = 7.x
package = Bean

; These modules are required.
dependencies[] = ctools
dependencies[] = entity

files[] = includes/bean.core.inc
files[] = includes/bean.info.inc
files[] = plugins/BeanPlugin.class.php
Expand All @@ -12,14 +18,15 @@ files[] = views/views_handler_field_bean_type.inc
files[] = views/views_handler_field_bean_edit_link.inc
files[] = views/views_handler_field_bean_delete_link.inc
files[] = views/views_handler_field_bean_operations.inc
files[] = bean.test
dependencies[] = entity
dependencies[] = ctools
package = Bean

; Information added by Drupal.org packaging script on 2016-08-08
version = "7.x-1.11"
; Tests.
files[] = tests/BeanSetup.test
files[] = tests/BeanTests.test
files[] = tests/BeanTestPlugins.test
files[] = tests/BeanUnitTests.test

; Information added by Drupal.org packaging script on 2018-08-09
version = "7.x-1.13"
core = "7.x"
project = "bean"
datestamp = "1470638340"

datestamp = "1533832989"
23 changes: 16 additions & 7 deletions modules/contrib/bean/bean.module
Expand Up @@ -75,6 +75,9 @@ function bean_entity_info() {
),
),
),

// @see devel_contrib.module
'devel contrib generator class' => 'DevelContribGeneratorDefault',
),
);

Expand Down Expand Up @@ -426,9 +429,11 @@ function bean_bean_cache_clear() {
drupal_static_reset('bean_fetch_plugin_info');
drupal_static_reset('bean_load_plugin_class');
drupal_static_reset('bean_block_info');
drupal_static_reset('bean_load_delta');

// Flush caches.
cache_clear_all('bean_plugins', 'cache');
cache_clear_all('bean_block_info', 'cache');

if (module_exists('block')) {
cache_clear_all(NULL, 'cache_block');
Expand All @@ -447,6 +452,8 @@ function bean_cache_clear_block($bean = null) {
else {
cache_clear_all('bean:', 'cache_block', TRUE);
}

cache_clear_all('bean_block_info', 'cache');
}

/**
Expand Down Expand Up @@ -563,7 +570,7 @@ function bean_load_revision($bid, $vid, $reset = FALSE) {
* A fully-loaded $bean object or FALSE if it cannot be loaded.
*/
function bean_load_delta($delta, $reset = FALSE, $revision = NULL) {
static $deltas = array();
$deltas = &drupal_static(__FUNCTION__, array());
if (!$reset && !$revision && isset($deltas[$delta])) {
return $deltas[$delta];
}
Expand Down Expand Up @@ -853,6 +860,12 @@ function bean_block_info() {
return $blocks;
}

$cache = cache_get('bean_block_info', 'cache');
if ($cache) {
$blocks = $cache->data;
return $blocks;
}

$blocks = array();
$beans = bean_get_all_beans();
foreach ($beans as $bean) {
Expand All @@ -862,6 +875,8 @@ function bean_block_info() {
);
}

cache_set('bean_block_info', $blocks, 'cache');

return $blocks;
}

Expand All @@ -886,12 +901,6 @@ function bean_block_view($delta = '') {
);
}

if (!empty($return['content']) && module_exists('contextual')) {
$return['content']['#contextual_links']['bean'] = array(
'block', array($bean->Identifier(), 'edit')
);
}

return $return;
}

Expand Down