Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2003368 by Dan Reinders, marlatt, NonProfit: Rename Views method pre_execute() to preExecute().

8.0.x
Alex Pott 2013-05-30 00:37:05 +01:00
parent 861277341c
commit 022531af66
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
View File

@ -2531,11 +2531,11 @@ abstract class DisplayPluginBase extends PluginBase {
$this->view->initHandlers(); $this->view->initHandlers();
if ($this->usesExposed()) { if ($this->usesExposed()) {
$exposed_form = $this->getPlugin('exposed_form'); $exposed_form = $this->getPlugin('exposed_form');
$exposed_form->pre_execute(); $exposed_form->preExecute();
} }
foreach ($this->extender as $extender) { foreach ($this->extender as $extender) {
$extender->pre_execute(); $extender->preExecute();
} }
$this->view->setShowAdminLinks($this->getOption('show_admin_links')); $this->view->setShowAdminLinks($this->getOption('show_admin_links'));

2
core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
View File

@ -41,7 +41,7 @@ abstract class DisplayExtenderPluginBase extends PluginBase {
/** /**
* Set up any variables on the view prior to execution. * Set up any variables on the view prior to execution.
*/ */
public function pre_execute() { } public function preExecute() { }
/** /**
* Inject anything into the query that the display_extender handler needs. * Inject anything into the query that the display_extender handler needs.

2
core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
View File

@ -178,7 +178,7 @@ abstract class ExposedFormPluginBase extends PluginBase {
function post_render(&$output) { } function post_render(&$output) { }
function pre_execute() { } public function preExecute() { }
public function postExecute() { } public function postExecute() { }

2
core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
View File

@ -205,7 +205,7 @@ abstract class PagerPluginBase extends PluginBase {
/** /**
* Perform any needed actions just prior to the query executing. * Perform any needed actions just prior to the query executing.
*/ */
function pre_execute(&$query) { } public function preExecute(&$query) { }
/** /**
* Perform any needed actions just after the query executing. * Perform any needed actions just after the query executing.

2
core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
View File

@ -1484,7 +1484,7 @@ class Sql extends QueryPluginBase {
} }
// Let the pager modify the query to add limits. // Let the pager modify the query to add limits.
$view->pager->pre_execute($query); $view->pager->preExecute($query);
if (!empty($this->limit) || !empty($this->offset)) { if (!empty($this->limit) || !empty($this->offset)) {
// We can't have an offset without a limit, so provide a very large limit instead. // We can't have an offset without a limit, so provide a very large limit instead.

2
core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php
View File

@ -53,7 +53,7 @@ class DisplayExtenderTest extends PluginTestBase {
$this->assertTrue($display_extender instanceof \Drupal\views_test_data\Plugin\views\display_extender\DisplayExtenderTest, 'Make sure the right class got initialized.'); $this->assertTrue($display_extender instanceof \Drupal\views_test_data\Plugin\views\display_extender\DisplayExtenderTest, 'Make sure the right class got initialized.');
$view->preExecute(); $view->preExecute();
$this->assertTrue($display_extender->testState['pre_execute'], 'Make sure the display extender was able to react on preExecute.'); $this->assertTrue($display_extender->testState['preExecute'], 'Make sure the display extender was able to react on preExecute.');
$view->execute(); $view->execute();
$this->assertTrue($display_extender->testState['query'], 'Make sure the display extender was able to react on query.'); $this->assertTrue($display_extender->testState['query'], 'Make sure the display extender was able to react on query.');
} }

6
core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php
View File

@ -102,10 +102,10 @@ class DisplayExtenderTest extends DisplayExtenderPluginBase {
} }
/** /**
* Overrides Drupal\views\Plugin\views\display\DisplayExtenderPluginBase::pre_execute(). * Overrides Drupal\views\Plugin\views\display\DisplayExtenderPluginBase::preExecute().
*/ */
public function pre_execute() { public function preExecute() {
$this->testState['pre_execute'] = TRUE; $this->testState['preExecute'] = TRUE;
} }
} }