Commit 863a9bd8 authored by alexpott's avatar alexpott

Issue #2002346 by heddn, crowdcg, marlatt, farfanfelipe, jibran: Rename Views...

Issue #2002346 by heddn, crowdcg, marlatt, farfanfelipe, jibran: Rename Views method adjust_join() to adjustJoin().
parent fc1bd6f3
......@@ -134,7 +134,7 @@ class JoinPluginBase extends ContainerFactoryPluginBase {
* @var bool
*
* @see Drupal\views\Plugin\HandlerBase::getTableJoin()
* @see Drupal\views\Plugin\views\query\Sql::adjust_join()
* @see Drupal\views\Plugin\views\query\Sql::adjustJoin()
* @see Drupal\views\Plugin\views\relationship\RelationshipPluginBase::query()
*/
public $adjusted;
......
......@@ -292,7 +292,7 @@ public function addRelationship($alias, JoinPluginBase $join, $base, $link_point
// Make sure this join is adjusted for our relationship.
if ($link_point && isset($this->relationships[$link_point])) {
$join = $this->adjust_join($join, $link_point);
$join = $this->adjustJoin($join, $link_point);
}
// Add the table directly to the queue to avoid accidentally marking
......@@ -355,7 +355,7 @@ public function addTable($table, $relationship = NULL, JoinPluginBase $join = NU
}
if ($join && $relationship) {
$join = $this->adjust_join($join, $relationship);
$join = $this->adjustJoin($join, $relationship);
}
return $this->queueTable($table, $relationship, $join, $alias);
......@@ -437,7 +437,7 @@ public function queueTable($table, $relationship = NULL, JoinPluginBase $join =
return FALSE;
}
$join = $this->adjust_join($join, $relationship);
$join = $this->adjustJoin($join, $relationship);
}
$this->table_queue[$alias] = array(
......@@ -528,7 +528,7 @@ function ensure_table($table, $relationship = NULL, JoinPluginBase $join = NULL)
// Adjust this join for the relationship, which will ensure that the 'base'
// table it links to is correct. Tables adjoined to a relationship
// join to a link point, not the base table.
$join = $this->adjust_join($join, $relationship);
$join = $this->adjustJoin($join, $relationship);
if ($this->ensurePath($table, $relationship, $join)) {
// Attempt to eliminate redundant joins. If this table's
......@@ -598,7 +598,7 @@ protected function ensurePath($table, $relationship = NULL, $join = NULL, $trace
// Make sure that we're linking to the correct table for our relationship.
foreach (array_reverse($add) as $table => $path_join) {
$this->queueTable($table, $relationship, $this->adjust_join($path_join, $relationship));
$this->queueTable($table, $relationship, $this->adjustJoin($path_join, $relationship));
}
return TRUE;
}
......@@ -624,7 +624,7 @@ protected function ensurePath($table, $relationship = NULL, $join = NULL, $trace
* Fix a join to adhere to the proper relationship; the left table can vary
* based upon what relationship items are joined in on.
*/
function adjust_join($join, $relationship) {
protected function adjustJoin($join, $relationship) {
if (!empty($join->adjusted)) {
return $join;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment