Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/215374
Change subject: Removed numbered params option for #formlink and related
functions
......................................................................
Removed numbered params option for #formlink and related functions
A long-deprecated feature that can finally be killed.
Change-Id: I5d8d52d600d6ed1ac97f7fcc97705f2cb434c38d
---
M includes/SF_Utils.php
1 file changed, 2 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/74/215374/1
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 5fc6d32..e0d96f1 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -986,8 +986,6 @@
$inQueryArr = array();
$targetWindow = '_self';
- $positionalParameters = false;
-
// assign params
// - support unlabelled params, for backwards compatibility
// - parse and sanitize all parameter values
@@ -996,7 +994,7 @@
$elements = explode( '=', $param, 2 );
// set param_name and value
- if ( count( $elements ) > 1 && !$positionalParameters )
{
+ if ( count( $elements ) > 1 ) {
$param_name = trim( $elements[0] );
// parse (and sanitize) parameter values
@@ -1031,24 +1029,9 @@
$classStr = 'popupformlink';
} elseif ( $param_name == null && $value == 'new
window' ) {
$targetWindow = '_blank';
- } elseif ( $param_name !== null &&
!$positionalParameters ) {
+ } elseif ( $param_name !== null ) {
$value = urlencode( $value );
parse_str( "$param_name=$value", $arr );
- $inQueryArr =
self::array_merge_recursive_distinct( $inQueryArr, $arr );
- } elseif ( $i == 0 ) {
- $inFormName = $value;
- $positionalParameters = true;
- } elseif ( $i == 1 ) {
- $inLinkStr = $value;
- } elseif ( $i == 2 ) {
- $inLinkType = $value;
- } elseif ( $i == 3 ) {
- // Change HTML-encoded ampersands directly to
- // URL-encoded ampersands, so that the string
- // doesn't get split up on the '&'.
- $inQueryStr = str_replace( '&', '%26',
$value );
-
- parse_str( $inQueryStr, $arr );
$inQueryArr =
self::array_merge_recursive_distinct( $inQueryArr, $arr );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/215374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d8d52d600d6ed1ac97f7fcc97705f2cb434c38d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <yaro...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
