Yaron Koren has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/351656 )
Change subject: Fix for 7db3cd6076f4 - different replacement string
......................................................................
Fix for 7db3cd6076f4 - different replacement string
Change-Id: I33b4714619a3441023daf2dbdb3c779909289048
---
M includes/PF_FormField.php
M includes/PF_FormPrinter.php
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/56/351656/2
diff --git a/includes/PF_FormField.php b/includes/PF_FormField.php
index eef7f71..c2887d4 100644
--- a/includes/PF_FormField.php
+++ b/includes/PF_FormField.php
@@ -688,7 +688,7 @@
// the value of this field, because disabled inputs for some
// reason don't submit their value.
if ( $this->mIsDisabled ) {
- if ( $field_name == 'free text' || $field_name ==
'"freetext"' ) {
+ if ( $field_name == 'free text' || $field_name ==
'#freetext#' ) {
$text .= Html::hidden( 'pf_free_text',
'!free_text!' );
} else {
if ( is_array( $cur_value ) ) {
diff --git a/includes/PF_FormPrinter.php b/includes/PF_FormPrinter.php
index 0b69018..3ac97e3 100644
--- a/includes/PF_FormPrinter.php
+++ b/includes/PF_FormPrinter.php
@@ -794,7 +794,7 @@
$preloaded_free_text = null;
// @HACK - replace the 'free text' standard input with a
// field declaration to get it to be handled as a field.
- $form_def = str_replace( 'standard input|free text',
'field|"freetext"', $form_def );
+ $form_def = str_replace( 'standard input|free text',
'field|#freetext#', $form_def );
while ( $brackets_loc = strpos( $form_def, "{{{",
$start_position ) ) {
$brackets_end_loc = strpos( $form_def, "}}}",
$brackets_loc );
$bracketed_string = substr( $form_def, $brackets_loc +
3, $brackets_end_loc - ( $brackets_loc + 3 ) );
@@ -923,7 +923,7 @@
// We get the field name both here
// and in the PFFormField constructor,
// because PFFormField isn't equipped
- // to deal with the "freetext" hack,
+ // to deal with the #freetext# hack,
// among others.
$field_name = trim( $tag_components[1]
);
$form_field =
PFFormField::newFromFormFieldTag( $tag_components, $template, $tif,
$form_is_disabled );
@@ -967,7 +967,7 @@
}
// Handle the free text field.
- if ( $field_name == '"freetext"' ) {
+ if ( $field_name == '#freetext#' ) {
// If there was no preloading,
this will just be blank.
$preloaded_free_text =
$cur_value;
// Add placeholders for the
free text in both the form and
@@ -1001,7 +1001,7 @@
$wiki_page->addFreeTextSection();
}
- if ( $tif->getTemplateName() === '' ||
$field_name == '"freetext"' ) {
+ if ( $tif->getTemplateName() === '' ||
$field_name == '#freetext#' ) {
$section = substr_replace(
$section, $new_text, $brackets_loc, $brackets_end_loc + 3 - $brackets_loc );
} else {
if ( is_array( $cur_value ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/351656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33b4714619a3441023daf2dbdb3c779909289048
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
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
