jenkins-bot has submitted this change and it was merged.
Change subject: Makes pages without index use text layer extraction and default
header and footer
......................................................................
Makes pages without index use text layer extraction and default header and
footer
Bug 58156
Change-Id: I7535683ae40c42891864d2b9e4e4054010d88fe5
---
M includes/page/EditProofreadPagePage.php
1 file changed, 35 insertions(+), 26 deletions(-)
Approvals:
Tpt: Looks good to me, approved
Rtdwivedi: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/page/EditProofreadPagePage.php
b/includes/page/EditProofreadPagePage.php
index d2c9d26..b83994e 100644
--- a/includes/page/EditProofreadPagePage.php
+++ b/includes/page/EditProofreadPagePage.php
@@ -63,38 +63,47 @@
* @see EditPage::showContentForm
*/
protected function getContentObject( $def_content = null ) {
+ if ( $this->mTitle->exists() ) {
+ return parent::getContentObject( $def_content );
+ }
+
//preload content
- if ( !$this->mTitle->exists() ) {
- $index = $this->pagePage->getIndex();
- if ( $index ) {
- $params = array(
- 'pagenum' =>
$index->getDisplayedPageNumber( $this->getTitle() )
- );
- $header =
$index->replaceVariablesWithIndexEntries( 'header', $params );
- $body = '';
- $footer =
$index->replaceVariablesWithIndexEntries( 'footer', $params );
+ $index = $this->pagePage->getIndex();
+ $body = '';
- //Extract text layer
- $image = $index->getImage();
- $pageNumber = $this->pagePage->getPageNumber();
- if ( $image && $pageNumber !== null &&
$image->exists() ) {
- $text =
$image->getHandler()->getPageText( $image, $pageNumber );
- if ( $text ) {
- $text = preg_replace(
"/(\\\\n)/", "\n", $text );
- $body = preg_replace(
"/(\\\\\d*)/", '', $text );
- }
- }
+ //default header and footer
+ if ( $index ) {
+ $params = array(
+ 'pagenum' => $index->getDisplayedPageNumber(
$this->getTitle() )
+ );
+ $header = $index->replaceVariablesWithIndexEntries(
'header', $params );
+ $footer = $index->replaceVariablesWithIndexEntries(
'footer', $params );
+ } else {
+ $header = wfMessage( 'proofreadpage_default_header'
)->inContentLanguage()->plain();
+ $footer = wfMessage( 'proofreadpage_default_footer'
)->inContentLanguage()->plain();
+ }
- return new ProofreadPageContent(
- new WikitextContent( $header ),
- new WikitextContent( $body ),
- new WikitextContent( $footer ),
- new ProofreadPageLevel()
- );
+ //Extract text layer
+ $image = $this->pagePage->getImage();
+ $pageNumber = $this->pagePage->getPageNumber();
+ if ( $image && $image->exists() ) {
+ if ( $pageNumber !== null && $image->isMultipage() ) {
+ $text = $image->getHandler()->getPageText(
$image, $pageNumber );
+ } else {
+ $text = $image->getHandler()->getPageText(
$image, 1 );
+ }
+ if ( $text ) {
+ $text = preg_replace( "/(\\\\n)/", "\n", $text
);
+ $body = preg_replace( "/(\\\\\d*)/", '', $text
);
}
}
- return parent::getContentObject( $def_content );
+ return new ProofreadPageContent(
+ new WikitextContent( $header ),
+ new WikitextContent( $body ),
+ new WikitextContent( $footer ),
+ new ProofreadPageLevel()
+ );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/100138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7535683ae40c42891864d2b9e4e4054010d88fe5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt <[email protected]>
Gerrit-Reviewer: Phe <[email protected]>
Gerrit-Reviewer: Rtdwivedi <[email protected]>
Gerrit-Reviewer: Tpt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
