Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions formats/datatables/QuerySegmentListProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function setQuerySegmentList( &$querySegmentList ) {
/**
* @since 2.2
*
* @param integer $queryMode
* @param int $queryMode
*/
public function setQueryMode( $queryMode ) {
$this->queryMode = $queryMode;
Expand Down Expand Up @@ -165,7 +165,7 @@ private function table( QuerySegment &$query ) {

$this->fromTables[$subQuery->alias] = $joinTable;

ksort($this->fromTables);
ksort( $this->fromTables );
$this->joinConditions[$subQuery->alias] = [ $joinType . ' JOIN', "$joinField$op=" . $subQuery->joinfield ];

$query->from .= " $joinType JOIN $t ON $joinField$op=" . $subQuery->joinfield;
Expand Down Expand Up @@ -389,3 +389,4 @@ public function cleanUp() {
}

}

18 changes: 9 additions & 9 deletions formats/datatables/SearchPanes.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
use SRF\DataTables;

class SearchPanes {
/** @const DataTables */
/** @var DataTables */
private $datatables;

private array $searchPanesLog = [];
Expand Down Expand Up @@ -696,7 +696,7 @@ private function searchPanesMainlabel( PrintRequest $printRequest, array $search
];

if ( $threshold < 1 ) {
return [];
return [];
}

$query = $this->datatables->query;
Expand All @@ -721,7 +721,7 @@ private function searchPanesMainlabel( PrintRequest $printRequest, array $search

$tables = $querySegmentListProcessor->fromTables;
$joins = $querySegmentListProcessor->joinConditions;

$tables[$qobj->alias] = $qobj->joinTable;

$conds = $qobj->where;
Expand Down Expand Up @@ -754,12 +754,12 @@ private function searchPanesMainlabel( PrintRequest $printRequest, array $search
$joins_ = $joins;

$res = $this->connection->select(
$tables_,
$fields_,
$conds_,
__METHOD__,
$sql_options_,
$joins_
$tables_,
$fields_,
$conds_,
__METHOD__,
$sql_options_,
$joins_
);

$diHandler = $this->datatables->store->getDataItemHandlerForDIType(
Expand Down