Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266650
Change subject: Improvements to SFWikiPage class
......................................................................
Improvements to SFWikiPage class
Change-Id: Ida0c3a9eb3fd201b58bc1fae80866b4422e30de5
---
M includes/SF_FormPrinter.php
M includes/wikipage/SF_WikiPage.php
2 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/50/266650/1
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index fa1be1d..40cc491 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -758,7 +758,9 @@
$tif->checkIfAllInstancesPrinted(
$form_submitted, $source_is_page );
- $wiki_page->addTemplate( $tif );
+ if ( !$tif->allInstancesPrinted() ) {
+ $wiki_page->addTemplate( $tif );
+ }
//
=====================================================
// end template processing
diff --git a/includes/wikipage/SF_WikiPage.php
b/includes/wikipage/SF_WikiPage.php
index 54120cf..be2cd82 100644
--- a/includes/wikipage/SF_WikiPage.php
+++ b/includes/wikipage/SF_WikiPage.php
@@ -15,10 +15,6 @@
private $mFreeTextOnlyInclude = false;
function addTemplate( $templateInForm ) {
- if ( $templateInForm->allInstancesPrinted() ) {
- return;
- }
-
$templateName = $templateInForm->getTemplateName();
$this->mComponents[] = new SFWikiPageTemplate( $templateName,
!$templateInForm->allowsMultiple() );
if ( $templateInForm->getInstanceNum() == 0 ) {
@@ -63,6 +59,7 @@
foreach ( $this->mComponents as $i => $component ) {
if ( get_class( $component ) == 'SFWikiPageFreeText' ) {
$this->mComponents[$i]->setText( $text );
+ return;
}
}
// Throw an exception here if no free text section found?
@@ -169,7 +166,10 @@
$sectionName = "=$sectionName=";
}
$pageText .= "$sectionName\n";
- $pageText .= $component->getText() . "\n";
+ if ( $component->getText() != '' ) {
+ $pageText .= $component->getText() .
"\n";
+ }
+ $pageText .= "\n";
} elseif ( get_class( $component ) ==
'SFWikiPageFreeText' ) {
$freeText = $component->getText();
if ( $this->mFreeTextOnlyInclude ) {
--
To view, visit https://gerrit.wikimedia.org/r/266650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida0c3a9eb3fd201b58bc1fae80866b4422e30de5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
