Skip to content

Change deprecated onArticleSave to onPageContentSave [revisited] #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
szotsaki wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Change deprecated onArticleSave to onPageContentSave [revisited] #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fac5879
Fix PHP Warning: array_splice() expects parameter 2 to be integer, s…
Albul Jan 23, 2019
a3657b0
Change deprecated onArticleSave on onPageContentSave https://www.medi…
Albul Jan 23, 2019
efbc5c5
Do not sendEmails when $wgEnableEmail = false;
Albul Jan 23, 2019
645f183
Compatibility with Translation extension
Albul Jan 24, 2019
0a240d3
Restore white spaces to tabs
szotsaki Dec 24, 2019
823aa7b
Remove hard-coded, seemingly site-specific code part
szotsaki Dec 24, 2019
30d3298
Restore commented-out code
szotsaki Dec 24, 2019
8345407
Replace deprecated DB_SLAVE to DB_REPLICA
szotsaki Dec 25, 2019
9847147
Revert "Compatibility with Translation extension"
szotsaki Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Wikilog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
// General Wikilog hooks
$wgHooks['ArticleEditUpdates'][] = 'WikilogHooks::ArticleEditUpdates';
$wgHooks['ArticleDelete'][] = 'WikilogHooks::ArticleDelete';
$wgHooks['ArticleSave'][] = 'WikilogHooks::ArticleSave';
$wgHooks['PageContentSave'][] = 'WikilogHooks::ArticleSave';
$wgHooks['TitleMoveComplete'][] = 'WikilogHooks::TitleMoveComplete';
$wgHooks['EditPage::attemptSave'][] = 'WikilogHooks::EditPageAttemptSave';
$wgHooks['EditPage::showEditForm:fields'][] = 'WikilogHooks::EditPageEditFormFields';
Expand Down Expand Up @@ -383,7 +383,7 @@ static function BeforePageDisplay( $output, $skin ) {
static function LinkBegin( $skin, $target, $text, $attribs, $query, &$options, &$ret )
{
if ( $target->isTalkPage() &&
( $i = array_search( 'broken', $options ) ) !== false ) {
( $i = array_search( 'broken', array_keys($options) ) ) !== false ) {
if ( self::nsHasComments( $target ) ) {
array_splice( $options, $i, 1 );
$options[] = 'known';
Expand Down
22 changes: 14 additions & 8 deletions WikilogHooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,12 @@ static function ArticleEditUpdates( $article, &$editInfo, $changed ) {
$item->saveData();

if ( !$wasPublished && $item->mPublish ) {
global $wgEnableEmail;
// Send email notifications about the new post
SpecialWikilogSubscriptions::sendEmails( $article,
!empty( $editInfo->pstContent ) ? $editInfo->pstContent->getNativeData() : $article->getText() );
if ( $wgEnableEmail ) {
SpecialWikilogSubscriptions::sendEmails( $article,
!empty( $editInfo->pstContent ) ? $editInfo->pstContent->getNativeData() : $article->getText() );
}
}
} else {
# Remove entry from tables. Entries in wikilog_authors and
Expand Down Expand Up @@ -237,27 +240,30 @@ static function ArticleDelete( $article, $user, $reason, &$error ) {
* Add article signature if user selected "sign and publish" option in
* EditPage, or if there is ~~~~ in the text.
*/
static function ArticleSave( $article, $user, &$text, &$summary,
$minor, $watch, $sectionanchor, &$flags )
static function ArticleSave( &$wikiPage, &$user, &$content, &$summary,
$isMinor, $isWatch, $section, &$flags, &$status )
{
$t = WikilogUtils::getPublishParameters();
$txtDate = $t['date'];
$txtUser = $t['user'];
$text = ContentHandler::getContentText( $content );

// $article->mExtWikilog piggybacked from WikilogHooks::EditPageAttemptSave().
if ( isset( $article->mExtWikilog ) && $article->mExtWikilog['signpub'] ) {
if ( isset( $wikiPage->mExtWikilog ) && $wikiPage->mExtWikilog['signpub'] ) {
$text = rtrim( $text ) . "\n{{wl-publish: $txtDate | $txtUser }}\n";
} elseif ( Wikilog::getWikilogInfo( $article->getTitle() ) ) {
} elseif ( Wikilog::getWikilogInfo( $wikiPage->getTitle() ) ) {
global $wgParser;
$sigs = array(
'/\n?(--)?~~~~~\n?/m' => "\n{{wl-publish: $txtDate }}\n",
'/\n?(--)?~~~~\n?/m' => "\n{{wl-publish: $txtDate | $txtUser }}\n",
'/\n?(--)?~~~\n?/m' => "\n{{wl-author: $txtUser }}\n"
);
$wgParser->startExternalParse( $article->getTitle(), ParserOptions::newFromUser( $user ), Parser::OT_WIKI );
$wgParser->startExternalParse( $wikiPage->getTitle(), ParserOptions::newFromUser( $user ), Parser::OT_WIKI );
$text = $wgParser->replaceVariables( $text );
$text = preg_replace( array_keys( $sigs ), array_values( $sigs ), $text );
$text = $wgParser->mStripState->unstripBoth( $text );
}
$content = new WikitextContent( $text );
return true;
}

Expand Down Expand Up @@ -377,7 +383,7 @@ static function EditPageAttemptSave( $editpage ) {

// Piggyback options into article object. Will be retrieved later
// in 'ArticleEditUpdates' hook.
$editpage->mArticle->mExtWikilog = $options;
$editpage->mArticle->getPage()->mExtWikilog = $options;
return true;
}

Expand Down