Commit c210fc8b authored by Neil Hastings's avatar Neil Hastings
Browse files

Issue #1836798 by bhauff: Block Label used rather than Title on block/delta and block/delta/view.

parent e76101c0

CHANGELOG.TXT

+1 −0
Changes for CHANGELOG.TXT: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Issue #1786036 by jonhattan | indytechcook: Fixed Caches not completely cleared. 
Integrate Bean Revisions

Issue #1814068 by jonhattan: Remove leftover patch files in repo.

Issue #1833176 by darrenmothersele: Fixed List Shortcut module as a dependency or remove from bean_install().

Issue #1836798 by bhauff: Block Label used rather than Title on block/delta and block/delta/view.



bean 7.x-1.0-rc6

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

bean.module

+4 −3
Changes for bean.module: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -771,7 +771,8 @@ function bean_view(Bean $bean, $view_mode = 'default', $langcode = NULL) { 
    $langcode = $GLOBALS['language_content']->language;

  }



  drupal_set_title($bean->label());

  $title = $bean->label() ? $bean->label() : $bean->label;

  drupal_set_title($title);

  return $bean->view($view_mode, $langcode);

}
@@ -783,7 +784,7 @@ function bean_block_info() { 
  $beans = bean_get_all_beans();

  foreach ($beans as $bean) {

    $blocks[$bean->delta] = array(

      'info' => $bean->label,

      'info' => $bean->label(),

      'cache' => $bean->getInfo('cache_level'),

    );

  }
@@ -801,7 +802,7 @@ function bean_block_view($delta = '') { 
  if (bean_access('view', $bean) && $bean) {

    $return = array(

      'content' => $bean->view($bean->view_mode),

      'subject' => $bean->title,

      'subject' => $bean->label(),

    );

  }

includes/bean.core.inc

+0 −4
Changes for includes/bean.core.inc: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -168,10 +168,6 @@ class Bean extends Entity { 
    return NULL;

  }



  public function defaultLabel() {

    return $this->label;

  }



  public function __construct(array $values = array()) {

    // If this is new then set the type first.

    if (isset($values['is_new'])) {