diff --git a/NEWS b/NEWS index a51447d..d8e3fd2 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +Version 4.0.3 (2016-11-22) +------------------------------------------------------------------------ + +- Fix: __NOAUTOLINKS__ magic word would not be respected when saving an edited page. + +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + + Version 4.0.2 (2016-11-09) ------------------------------------------------------------------------ diff --git a/extension.json b/extension.json index ce5bff0..f68891e 100644 --- a/extension.json +++ b/extension.json @@ -6,7 +6,7 @@ ], "type": "parserhook", "url": "https://www.mediawiki.org/wiki/Extension:LinkTitles", - "version": "4.0.2", + "version": "4.0.3", "license-name": "GPL-2.0+", "descriptionmsg": "linktitles-desc", "requires": { diff --git a/includes/LinkTitles_Extension.php b/includes/LinkTitles_Extension.php index 09ae694..40fa6c4 100644 --- a/includes/LinkTitles_Extension.php +++ b/includes/LinkTitles_Extension.php @@ -71,17 +71,18 @@ class Extension { global $wgLinkTitlesNamespaces; if ( !$wgLinkTitlesParseOnEdit ) return true; - if ( !$isMinor && !\MagicWord::get( 'MAG_LINKTITLES_NOAUTOLINKS' )->match( $text ) ) { + if ( !$isMinor ) { $title = $wikiPage->getTitle(); // Only process if page is in one of our namespaces we want to link // Fixes ugly autolinking of sidebar pages - if ( in_array( $title->getNamespace(), $wgLinkTitlesNamespaces )) - { + if ( in_array( $title->getNamespace(), $wgLinkTitlesNamespaces )) { $text = $content->getContentHandler()->serializeContent( $content ); - $newText = self::parseContent( $title, $text ); - if ( $newText != $text ) { - $content = $content->getContentHandler()->unserializeContent( $newText ); + if ( !\MagicWord::get( 'MAG_LINKTITLES_NOAUTOLINKS' )->match( $text ) ) { + $newText = self::parseContent( $title, $text ); + if ( $newText != $text ) { + $content = $content->getContentHandler()->unserializeContent( $newText ); + } } } };