[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Uses IndexContent to serialize index content on save

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

Change subject: Uses IndexContent to serialize index content on save
..


Uses IndexContent to serialize index content on save

Change-Id: I41df28dffcec09bc2f5487616e1aab6545c92c2c
---
M includes/index/EditIndexPage.php
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  jenkins-bot: Verified
  Tpt: Looks good to me, approved
  Amritsreekumar: Looks good to me, but someone else must approve



diff --git a/includes/index/EditIndexPage.php b/includes/index/EditIndexPage.php
index 909b96f..2c25d86 100644
--- a/includes/index/EditIndexPage.php
+++ b/includes/index/EditIndexPage.php
@@ -9,6 +9,7 @@
 use ProofreadIndexEntry;
 use ProofreadIndexPage;
 use Status;
+use WikitextContent;
 use Xml;
 use XmlSelect;
 
@@ -128,17 +129,16 @@
}
 
$config = ProofreadIndexPage::getDataConfig();
-   $text = "{{:MediaWiki:Proofreadpage_index_template";
+   $fields = [];
foreach ( $config as $key => $params ) {
$field = $this->getFieldNameForEntry( $key );
$value = $this->cleanInputtedContent( 
$this->safeUnicodeInput( $request, $field ) );
$entry = new ProofreadIndexEntry( $key, $value, $params 
);
if ( !$entry->isHidden() ) {
-   $text .= "\n|" . $entry->getKey() . "=" . 
$entry->getStringValue();
+   $fields[$entry->getKey()] = new 
WikitextContent( $entry->getStringValue() );
}
}
-
-   return $text . "\n}}";
+   return ( new IndexContent( $fields ) )->serialize( 
$this->contentFormat );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41df28dffcec09bc2f5487616e1aab6545c92c2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Amritsreekumar 
Gerrit-Reviewer: Phe 
Gerrit-Reviewer: Tpt 
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...ProofreadPage[master]: Uses IndexContent to serialize index content on save

2017-06-17 Thread Tpt (Code Review) 
Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359650 )

Change subject: Uses IndexContent to serialize index content on save
..

Uses IndexContent to serialize index content on save

Change-Id: I41df28dffcec09bc2f5487616e1aab6545c92c2c
---
M includes/index/EditIndexPage.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/50/359650/1

diff --git a/includes/index/EditIndexPage.php b/includes/index/EditIndexPage.php
index 909b96f..2c25d86 100644
--- a/includes/index/EditIndexPage.php
+++ b/includes/index/EditIndexPage.php
@@ -9,6 +9,7 @@
 use ProofreadIndexEntry;
 use ProofreadIndexPage;
 use Status;
+use WikitextContent;
 use Xml;
 use XmlSelect;
 
@@ -128,17 +129,16 @@
}
 
$config = ProofreadIndexPage::getDataConfig();
-   $text = "{{:MediaWiki:Proofreadpage_index_template";
+   $fields = [];
foreach ( $config as $key => $params ) {
$field = $this->getFieldNameForEntry( $key );
$value = $this->cleanInputtedContent( 
$this->safeUnicodeInput( $request, $field ) );
$entry = new ProofreadIndexEntry( $key, $value, $params 
);
if ( !$entry->isHidden() ) {
-   $text .= "\n|" . $entry->getKey() . "=" . 
$entry->getStringValue();
+   $fields[$entry->getKey()] = new 
WikitextContent( $entry->getStringValue() );
}
}
-
-   return $text . "\n}}";
+   return ( new IndexContent( $fields ) )->serialize( 
$this->contentFormat );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41df28dffcec09bc2f5487616e1aab6545c92c2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

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