[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fixed handling of WikiEditor, "placeholder" for section tags

2017-11-09 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390250 )

Change subject: Fixed handling of WikiEditor, "placeholder" for section tags
..


Fixed handling of WikiEditor, "placeholder" for section tags

Change-Id: I28837e6b68142ba0cd509340a5769e6490fe42ee
---
M includes/PF_FormPrinter.php
M includes/PF_PageSection.php
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/PF_FormPrinter.php b/includes/PF_FormPrinter.php
index 551e748..e2bc5ca 100644
--- a/includes/PF_FormPrinter.php
+++ b/includes/PF_FormPrinter.php
@@ -1303,7 +1303,7 @@
if ( $page_section_in_form->isHidden() 
) {
$form_section_text = 
Html::hidden( $input_name, $section_text );
} else {
-   $sectionInput = new 
PFTextAreaInput( $input_number = null, $section_text, $input_name, ( 
$form_is_disabled || $page_section_in_form->isRestricted() ), $other_args );
+   $sectionInput = new 
PFTextAreaInput( $wgPageFormsFieldNum, $section_text, $input_name, ( 
$form_is_disabled || $page_section_in_form->isRestricted() ), $other_args );
$sectionInput->addJavaScript();
$form_section_text = 
$sectionInput->getHtmlText();
}
diff --git a/includes/PF_PageSection.php b/includes/PF_PageSection.php
index 34a405f..0a36eca 100644
--- a/includes/PF_PageSection.php
+++ b/includes/PF_PageSection.php
@@ -25,8 +25,6 @@
}
 
static function newFromFormTag( $tag_components ) {
-   global $wgUser;
-
$ps = new PFPageSection();
$ps->mSectionName = trim( $tag_components[1] );
 
@@ -40,6 +38,7 @@
} elseif ( $component === 'hidden' ) {
$ps->mIsHidden = true;
} elseif ( $component === 'restricted' ) {
+   global $wgUser;
$ps->mIsRestricted = !( $wgUser && 
$wgUser->isAllowed( 'editrestrictedfields' ) );
} elseif ( $component === 'autogrow' ) {
$ps->mSectionArgs['autogrow'] = true;
@@ -58,6 +57,7 @@
case 'cols':
case 'class':
case 'editor':
+   case 'placeholder':
$ps->mSectionArgs[$sub_components[0]] = 
$sub_components[1];
break;
default:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28837e6b68142ba0cd509340a5769e6490fe42ee
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
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...PageForms[master]: Fixed handling of WikiEditor, "placeholder" for section tags

2017-11-09 Thread Yaron Koren (Code Review) 
Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390250 )

Change subject: Fixed handling of WikiEditor, "placeholder" for section tags
..

Fixed handling of WikiEditor, "placeholder" for section tags

Change-Id: I28837e6b68142ba0cd509340a5769e6490fe42ee
---
M includes/PF_FormPrinter.php
M includes/PF_PageSection.php
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/50/390250/2

diff --git a/includes/PF_FormPrinter.php b/includes/PF_FormPrinter.php
index 551e748..e2bc5ca 100644
--- a/includes/PF_FormPrinter.php
+++ b/includes/PF_FormPrinter.php
@@ -1303,7 +1303,7 @@
if ( $page_section_in_form->isHidden() 
) {
$form_section_text = 
Html::hidden( $input_name, $section_text );
} else {
-   $sectionInput = new 
PFTextAreaInput( $input_number = null, $section_text, $input_name, ( 
$form_is_disabled || $page_section_in_form->isRestricted() ), $other_args );
+   $sectionInput = new 
PFTextAreaInput( $wgPageFormsFieldNum, $section_text, $input_name, ( 
$form_is_disabled || $page_section_in_form->isRestricted() ), $other_args );
$sectionInput->addJavaScript();
$form_section_text = 
$sectionInput->getHtmlText();
}
diff --git a/includes/PF_PageSection.php b/includes/PF_PageSection.php
index 34a405f..0a36eca 100644
--- a/includes/PF_PageSection.php
+++ b/includes/PF_PageSection.php
@@ -25,8 +25,6 @@
}
 
static function newFromFormTag( $tag_components ) {
-   global $wgUser;
-
$ps = new PFPageSection();
$ps->mSectionName = trim( $tag_components[1] );
 
@@ -40,6 +38,7 @@
} elseif ( $component === 'hidden' ) {
$ps->mIsHidden = true;
} elseif ( $component === 'restricted' ) {
+   global $wgUser;
$ps->mIsRestricted = !( $wgUser && 
$wgUser->isAllowed( 'editrestrictedfields' ) );
} elseif ( $component === 'autogrow' ) {
$ps->mSectionArgs['autogrow'] = true;
@@ -58,6 +57,7 @@
case 'cols':
case 'class':
case 'editor':
+   case 'placeholder':
$ps->mSectionArgs[$sub_components[0]] = 
$sub_components[1];
break;
default:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28837e6b68142ba0cd509340a5769e6490fe42ee
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
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