[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added more forbidden pseudo-SQL keywords for field names

2018-01-22 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405740 )

Change subject: Added more forbidden pseudo-SQL keywords for field names
..


Added more forbidden pseudo-SQL keywords for field names

Change-Id: I9b4e0d8cc5ab43bd3fa3c1408e0cc950e0dfd6f7
---
M includes/parserfunctions/CargoDeclare.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yaron Koren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/parserfunctions/CargoDeclare.php 
b/includes/parserfunctions/CargoDeclare.php
index 0fcd7bc..26f3c88 100644
--- a/includes/parserfunctions/CargoDeclare.php
+++ b/includes/parserfunctions/CargoDeclare.php
@@ -67,7 +67,7 @@
} elseif ( in_array( strtolower( $fieldName ),
// Similarly, handle the Cargo
// pseudo-SQL keywords.
-   array( 'holds', 'near' ) ) ) {
+   array( 'holds', 'matches', 'near', 
'within' ) ) ) {
return CargoUtils::formatError( "Error: 
\"$fieldName\" cannot be used as a Cargo field name, because it is already a 
Cargo keyword." );
}
try {

-- 
To view, visit https://gerrit.wikimedia.org/r/405740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b4e0d8cc5ab43bd3fa3c1408e0cc950e0dfd6f7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added more forbidden pseudo-SQL keywords for field names

2018-01-22 Thread Yaron Koren (Code Review) 
Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405740 )

Change subject: Added more forbidden pseudo-SQL keywords for field names
..

Added more forbidden pseudo-SQL keywords for field names

Change-Id: I9b4e0d8cc5ab43bd3fa3c1408e0cc950e0dfd6f7
---
M includes/parserfunctions/CargoDeclare.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/40/405740/2

diff --git a/includes/parserfunctions/CargoDeclare.php 
b/includes/parserfunctions/CargoDeclare.php
index 0fcd7bc..26f3c88 100644
--- a/includes/parserfunctions/CargoDeclare.php
+++ b/includes/parserfunctions/CargoDeclare.php
@@ -67,7 +67,7 @@
} elseif ( in_array( strtolower( $fieldName ),
// Similarly, handle the Cargo
// pseudo-SQL keywords.
-   array( 'holds', 'near' ) ) ) {
+   array( 'holds', 'matches', 'near', 
'within' ) ) ) {
return CargoUtils::formatError( "Error: 
\"$fieldName\" cannot be used as a Cargo field name, because it is already a 
Cargo keyword." );
}
try {

-- 
To view, visit https://gerrit.wikimedia.org/r/405740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b4e0d8cc5ab43bd3fa3c1408e0cc950e0dfd6f7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits