EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108480
Change subject: Repair some small programming errors
......................................................................
Repair some small programming errors
- WritableObjectStorage::getFieldRegex was undefined, it should be
getFieldRegexFragment
- swap undefined $offset to the $value it should have been
- remove non-existant parameter to ResultDuplicator::getResult
- remove non-existant third param to NoIndexException::__construct
Change-Id: Ibe56ece13b678137d51c395ca2df51688038df44
---
M includes/Data/ObjectManager.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/80/108480/1
diff --git a/includes/Data/ObjectManager.php b/includes/Data/ObjectManager.php
index 3563682..c8137b1 100644
--- a/includes/Data/ObjectManager.php
+++ b/includes/Data/ObjectManager.php
@@ -407,7 +407,7 @@
$count = count( $this->indexes );
throw new NoIndexException(
"No index (out of $count) available to answer
query for " . implode( ", ", $keys ) .
- ' with options ' . FormatJson::encode( $options
), 'process-data', 'no-index'
+ ' with options ' . FormatJson::encode( $options
), 'no-index'
);
}
return $current;
@@ -694,7 +694,7 @@
return true;
}
- if ( ! preg_match( '/^' . $this->getFieldRegex() .
'$/', $key ) ) {
+ if ( ! preg_match( '/^' .
$this->getFieldRegexFragment() . '$/', $key ) ) {
return true;
}
}
@@ -756,7 +756,7 @@
} elseif ( $key === 'OFFSET' ) {
// OFFSET is just an integer
if ( ! is_numeric( $value ) ) {
- wfDebug( __METHOD__.": non-numeric
offset $offset\n" );
+ wfDebug( __METHOD__.": non-numeric
offset $value\n" );
return false;
}
} elseif ( $key === 'GROUP BY' ) {
@@ -1495,7 +1495,7 @@
$duplicator->merge( $first, $first );
}
- return $duplicator->getResult( /* strict = */ true );
+ return $duplicator->getResult();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/108480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe56ece13b678137d51c395ca2df51688038df44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
