Commit d0c9d958 authored by Jonathan's avatar Jonathan Committed by Neil Hastings
Browse files

Issue #1859450 by jonhattan: Drop dependency on block.module.

parent 09c359b7

CHANGELOG.TXT

+1 −0
Changes for CHANGELOG.TXT: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Issue #1838088 by jamesharv: Fixed Adding bean type and permissions to existing 
Issue #1845974 by indytechcook: Fixed Block Admin label is correct.

Issue #1793586 by Mixologic | indytechcook: Fixed Editing Bean Content Does not Trigger Page Cache Clear.

Issue #1870730 by jm.federico: Fixed bean_view() changes the current page title.

Issue #1859450 by jonhattan: Drop dependency on block.module.



bean 7.x-1.0-rc6

================

bean-1859450_0.patch

0 → 100644
+25 −0
Changes for bean-1859450_0.patch: 25 added lines, 0 removed lines.
Original line number Diff line number Diff line 
diff --git a/bean.info b/bean.info

index bbcb4fd..d95119e 100644

--- a/bean.info

+++ b/bean.info

@@ -7,7 +7,6 @@ files[] = plugins/base.inc

 files[] = includes/translation.handler.bean.inc

 files[] = views/views_handler_filter_bean_type.inc

 files[] = bean.test

-dependencies[] = block

 dependencies[] = entity

 dependencies[] = ctools

 package = Bean

diff --git a/bean_all/plugins/all.inc b/bean_all/plugins/all.inc

index 5748072..ef79392 100644

--- a/bean_all/plugins/all.inc

+++ b/bean_all/plugins/all.inc

@@ -29,6 +29,8 @@ class BeanAll extends BeanPlugin {

     $block_object->title = $block_object->info;

     $block_object->enabled = $block_object->page_match = TRUE;

     $blocks[$this->getBlockInfo('module') . "_" . $this->getBlockInfo('delta')] = $block_object;

+

+    module_load_include('module', 'block', 'block');

     $block_content = _block_render_blocks($blocks);

     $content += _block_get_renderable_array($block_content);

bean.info

+0 −1
Changes for bean.info: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ files[] = plugins/base.inc 
files[] = includes/translation.handler.bean.inc

files[] = views/views_handler_filter_bean_type.inc

files[] = bean.test

dependencies[] = block

dependencies[] = entity

dependencies[] = ctools

package = Bean

bean_all/plugins/all.inc

+2 −0
Changes for bean_all/plugins/all.inc: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ class BeanAll extends BeanPlugin { 
    $block_object->title = $block_object->info;

    $block_object->enabled = $block_object->page_match = TRUE;

    $blocks[$this->getBlockInfo('module') . "_" . $this->getBlockInfo('delta')] = $block_object;



    module_load_include('module', 'block', 'block');

    $block_content = _block_render_blocks($blocks);

    $content += _block_get_renderable_array($block_content);