Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317504
Change subject: Cosmetic fixes
......................................................................
Cosmetic fixes
Change-Id: I9bc313f028648f26731dcd74b223e6ae2c945e5f
---
M drilldown/CargoFilter.php
M drilldown/CargoSpecialDrilldown.php
M formats/CargoTemplateFormat.php
3 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/04/317504/2
diff --git a/drilldown/CargoFilter.php b/drilldown/CargoFilter.php
index d546e7b..4e06932 100644
--- a/drilldown/CargoFilter.php
+++ b/drilldown/CargoFilter.php
@@ -1,4 +1,4 @@
-<?php
+ <?php
/**
* Defines a class, CargoFilter, that holds the information in a filter.
*
@@ -93,7 +93,7 @@
$tableNames = array( $this->tableName );
$conds = array();
$joinConds = array();
-
+
if ( $fullTextSearchTerm != null ) {
list( $curTableNames, $curConds, $curJoinConds ) =
CargoDrilldownPage::getFullTextSearchQueryParts( $fullTextSearchTerm,
$this->tableName, $this->searchableFiles );
diff --git a/drilldown/CargoSpecialDrilldown.php
b/drilldown/CargoSpecialDrilldown.php
index f93b24b..135ca6d 100644
--- a/drilldown/CargoSpecialDrilldown.php
+++ b/drilldown/CargoSpecialDrilldown.php
@@ -962,7 +962,7 @@
} else {
$appliedFiltersHTML .= str_replace( '_', ' ',
$this->tableName );
}
-
+
if ( $this->fullTextSearchTerm != null ) {
$appliedFiltersHTML .= " > ";
$appliedFiltersHTML .= $this->msg(
'cargo-drilldown-fulltext' )->text() . ': ';
@@ -1042,7 +1042,7 @@
$cur_url .= ( strpos( $cur_url, '?' ) ) ? '&' : '?';
if ( in_array( 'fullText', $wgCargoPageDataColumns ) ) {
- $fullTextSearchInput = $this->printTextInput(
'_search', 0, true, $this->fullTextSearchTerm );
+ $fullTextSearchInput = $this->printTextInput(
'_search', 0, true, $this->fullTextSearchTerm );
$filtersHTML .= self::printFilterLine( $this->msg(
'cargo-drilldown-fulltext' )->text(), false, false, $fullTextSearchInput );
}
@@ -1092,7 +1092,7 @@
$value_string = str_replace( ' ', '_',
$af->values[0]->text );
$params[$key_string] = $value_string;
} else {
- // HACK - QueryPage's pagination-URL code,
+ // @HACK - QueryPage's pagination-URL code,
// which uses wfArrayToCGI(), doesn't support
// two-dimensional arrays, which is what we
// need - instead, add the brackets directly
@@ -1145,7 +1145,7 @@
if ( $this->searchableFiles ) {
$aliasedFieldNames['fileName'] =
'cargo___fileData._pageName';
$aliasedFieldNames['fileText'] =
'cargo___fileData._fullText';
- // @HACK - the result set may contain both
+ // @HACK - the result set may contain both
// pages and files that match the search term.
// So how do we know, for each result row,
// whether it's for a page or a file? We add
@@ -1182,7 +1182,7 @@
' = ' .
CargoUtils::escapedFieldName( $cdb, '_pageData',
'_pageID' )
);
-
+
if ( $searchableFiles ) {
$fileTableName = $mainTableName . '___files';
$tableNames[] = $fileTableName;
diff --git a/formats/CargoTemplateFormat.php b/formats/CargoTemplateFormat.php
index 91d153a..05af76c 100644
--- a/formats/CargoTemplateFormat.php
+++ b/formats/CargoTemplateFormat.php
@@ -13,7 +13,7 @@
function displayRow( $templateName, $row, $fieldDescriptions,
$namedArgs ) {
$wikiText = '{{' . $templateName;
// If we're not using named arguments, we add the field number
- // in to the template call, to not mess up values that contain
'='.
+ // in to the template call, to not mess up values that contain
'='.
$fieldNum = 1;
foreach ( $fieldDescriptions as $fieldName => $fieldDescription
) {
if ( array_key_exists( $fieldName, $row ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/317504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bc313f028648f26731dcd74b223e6ae2c945e5f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
