Issue #1881672 by dawehner: Remove unused executeHookBlockList() code.
parent
67ed2eb4b9
commit
cf0a25f67f
|
@ -46,31 +46,6 @@ class Block extends DisplayPluginBase {
|
|||
return $options;
|
||||
}
|
||||
|
||||
/**
|
||||
* The default block handler doesn't support configurable items,
|
||||
* but extended block handlers might be able to do interesting
|
||||
* stuff with it.
|
||||
*/
|
||||
public function executeHookBlockList($delta = 0, $edit = array()) {
|
||||
$delta = $this->view->storage->get('name') . '-' . $this->display['id'];
|
||||
$desc = $this->getOption('block_description');
|
||||
|
||||
if (empty($desc)) {
|
||||
if ($this->display['display_title'] == $this->definition['title']) {
|
||||
$desc = t('View: !view', array('!view' => $this->view->storage->getHumanName()));
|
||||
}
|
||||
else {
|
||||
$desc = t('View: !view: !display', array('!view' => $this->view->storage->getHumanName(), '!display' => $this->display['display_title']));
|
||||
}
|
||||
}
|
||||
return array(
|
||||
$delta => array(
|
||||
'info' => $desc,
|
||||
'cache' => $this->getCacheType()
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* The display block handler returns the structure necessary for a block.
|
||||
*/
|
||||
|
|
|
@ -2431,11 +2431,6 @@ abstract class DisplayPluginBase extends PluginBase {
|
|||
return $this->renderArea('empty', TRUE);
|
||||
}
|
||||
|
||||
/**
|
||||
* If this display creates a block, implement one of these.
|
||||
*/
|
||||
public function hookBlockList($delta = 0, $edit = array()) { return array(); }
|
||||
|
||||
/**
|
||||
* If this display creates a page with a menu item, implement it here.
|
||||
*/
|
||||
|
|
|
@ -1506,24 +1506,6 @@ class ViewExecutable {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Called to get hook_block information from the view and the
|
||||
* named display handler.
|
||||
*/
|
||||
public function executeHookBlockList($display_id = NULL) {
|
||||
// Prepare the view with the information we have.
|
||||
|
||||
// This was probably already called, but it's good to be safe.
|
||||
if (!$this->setDisplay($display_id)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
// Execute the view
|
||||
if (isset($this->display_handler)) {
|
||||
return $this->display_handler->executeHookBlockList();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine if the given user has access to the view. Note that
|
||||
* this sets the display handler if it hasn't been.
|
||||
|
|
Loading…
Reference in New Issue