From ae1f72aefd1ae9c661775539ad16fed7751540da Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Sat, 23 Feb 2013 14:07:00 +0100 Subject: [PATCH] Do not remove magic word when saving page. --- LinkTitles.body.php | 9 ++++++++- LinkTitles.i18n.magic.php | 2 +- NEWS | 4 ++++ release/LinkTitles-2.1.0.tar.gz | Bin 0 -> 11230 bytes 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 release/LinkTitles-2.1.0.tar.gz diff --git a/LinkTitles.body.php b/LinkTitles.body.php index 1c409d3..b969579 100755 --- a/LinkTitles.body.php +++ b/LinkTitles.body.php @@ -42,6 +42,7 @@ if ( $wgLinkTitlesParseOnRender ) { $wgHooks['ArticleAfterFetchContent'][] = 'LinkTitles::onArticleAfterFetchContent'; }; + $wgHooks['ParserBeforeTidy'][] = 'LinkTitles::removeMagicWord'; } /// This function is hooked to the ArticleSave event. @@ -76,7 +77,7 @@ // If the page contains the magic word '__NOAUTOLINKS__', do not parse // the content. $mw = MagicWord::get('MAG_LINKTITLES_NOAUTOLINKS'); - if ( $mw -> matchAndRemove( $text ) ) { + if ( $mw -> match( $text ) ) { return true; } @@ -200,6 +201,12 @@ return '[[' . LinkTitles::$safeTitle . '|' . $matches[0] . ']]'; } } + + function removeMagicWord( &$parser, &$text ) { + $mw = MagicWord::get('MAG_LINKTITLES_NOAUTOLINKS'); + $mw -> matchAndRemove( $text ); + return true; + } } // vim: ts=2:sw=2:noet diff --git a/LinkTitles.i18n.magic.php b/LinkTitles.i18n.magic.php index 4c35011..5d753b8 100644 --- a/LinkTitles.i18n.magic.php +++ b/LinkTitles.i18n.magic.php @@ -5,6 +5,6 @@ $magicWords = array(); $magicWords['en'] = array( - 'MAG_LINKTITLES_NOAUTOLINKS' => '__NOAUTOLINKS__', + 'MAG_LINKTITLES_NOAUTOLINKS' => array(0, '__NOAUTOLINKS__') ); diff --git a/NEWS b/NEWS index 7d5172f..385b97c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +LinkTitles 2.1.0: 2013-02-23 +* Introduced new 'magic word' __NOAUTOLINKS__, whose presence on a page will + prevent the extension from adding links. + LinkTitles 2.0.0: 2013-01-29 * Introduced a new 'smart mode' ($wgLinkTitlesSmartMode) which is enabled by default and will automatically generate aliased links if there is a case diff --git a/release/LinkTitles-2.1.0.tar.gz b/release/LinkTitles-2.1.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..78aad18c407c18d24f93a4308133e78f7d08f9ad GIT binary patch literal 11230 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 I(Ey+T0349Ir2qf` literal 0 HcmV?d00001