Commit b58f4441 authored by alexpott's avatar alexpott
Browse files

Issue #2002924 by markie: Rename Views method get_join_data() to getJoinData().

parent 9ae13bc8
...@@ -447,7 +447,7 @@ public function queueTable($table, $relationship = NULL, JoinPluginBase $join = ...@@ -447,7 +447,7 @@ public function queueTable($table, $relationship = NULL, JoinPluginBase $join =
// If no join is specified, pull it from the table data. // If no join is specified, pull it from the table data.
if (!isset($join)) { if (!isset($join)) {
$join = $this->get_join_data($table, $this->relationships[$relationship]['base']); $join = $this->getJoinData($table, $this->relationships[$relationship]['base']);
if (empty($join)) { if (empty($join)) {
return FALSE; return FALSE;
} }
...@@ -532,7 +532,7 @@ function ensure_table($table, $relationship = NULL, JoinPluginBase $join = NULL) ...@@ -532,7 +532,7 @@ function ensure_table($table, $relationship = NULL, JoinPluginBase $join = NULL)
// If we do not have join info, fetch it. // If we do not have join info, fetch it.
if (!isset($join)) { if (!isset($join)) {
$join = $this->get_join_data($table, $this->relationships[$relationship]['base']); $join = $this->getJoinData($table, $this->relationships[$relationship]['base']);
} }
// If it can't be fetched, this won't work. // If it can't be fetched, this won't work.
...@@ -598,7 +598,7 @@ function ensure_path($table, $relationship = NULL, $join = NULL, $traced = array ...@@ -598,7 +598,7 @@ function ensure_path($table, $relationship = NULL, $join = NULL, $traced = array
// If we do not have join info, fetch it. // If we do not have join info, fetch it.
if (!isset($join)) { if (!isset($join)) {
$join = $this->get_join_data($table, $this->relationships[$relationship]['base']); $join = $this->getJoinData($table, $this->relationships[$relationship]['base']);
} }
// If it can't be fetched, this won't work. // If it can't be fetched, this won't work.
...@@ -625,7 +625,7 @@ function ensure_path($table, $relationship = NULL, $join = NULL, $traced = array ...@@ -625,7 +625,7 @@ function ensure_path($table, $relationship = NULL, $join = NULL, $traced = array
} }
// Do we have to add this table? // Do we have to add this table?
$left_join = $this->get_join_data($join->leftTable, $this->relationships[$relationship]['base']); $left_join = $this->getJoinData($join->leftTable, $this->relationships[$relationship]['base']);
if (!isset($this->tables[$relationship][$join->leftTable])) { if (!isset($this->tables[$relationship][$join->leftTable])) {
$add[$join->leftTable] = $left_join; $add[$join->leftTable] = $left_join;
} }
...@@ -692,7 +692,7 @@ function adjust_join($join, $relationship) { ...@@ -692,7 +692,7 @@ function adjust_join($join, $relationship) {
* @return Drupal\views\Plugin\views\join\JoinPluginBase * @return Drupal\views\Plugin\views\join\JoinPluginBase
* A Join object or child object, if one exists. * A Join object or child object, if one exists.
*/ */
function get_join_data($table, $base_table) { public function getJoinData($table, $base_table) {
// Check to see if we're linking to a known alias. If so, get the real // Check to see if we're linking to a known alias. If so, get the real
// table's data instead. // table's data instead.
if (!empty($this->table_queue[$table])) { if (!empty($this->table_queue[$table])) {
......
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