opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.0.0 beta 14. For more information, see https://drupal.org/node/2544542

Browse source
This commit is contained in:
Pantheon Automation 2015-08-27 12:03:05 -07:00 • committed by Greg Anderson
parent 3b2511d96d
commit 81ccda77eb
2155 changed files with 54307 additions and 46870 deletions
Download patch file Download diff file Expand all files Collapse all files

26
core/modules/views/src/ViewExecutable.php
View file

@ -9,7 +9,6 @@ namespace Drupal\views;
use Drupal\Component\Utility\Html;
use Drupal\Core\Cache\Cache;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
use Drupal\Core\Form\FormState;
use Drupal\Core\Routing\RouteProviderInterface;
@ -1615,29 +1614,6 @@ class ViewExecutable implements \Serializable {
$this->is_attachment = FALSE;
}
/**
* Returns menu links from the view and the named display handler.
*
* @param string $display_id
* A display ID.
*
* @return array|bool
* The generated menu links for this view and display, FALSE if the call
* to ::setDisplay failed.
*/
public function getMenuLinks($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 hook.
if (isset($this->display_handler)) {
return $this->display_handler->getMenuLinks();
}
}
/**
* Determine if the given user has access to the view. Note that
* this sets the display handler if it hasn't been.
@ -1897,7 +1873,7 @@ class ViewExecutable implements \Serializable {
public function getUrlInfo($display_id = '') {
$this->initDisplay();
if (!$this->display_handler instanceof DisplayRouterInterface) {
throw new \InvalidArgumentException(SafeMarkup::format('You cannot generate a URL for the display @display_id', ['@display_id' => $display_id]));
throw new \InvalidArgumentException("You cannot generate a URL for the display '$display_id'");
}
return $this->display_handler->getUrlInfo();
}