From 6d38db71afed4c9de04c556fc13ea6980c2d3aa2 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Sat, 23 Feb 2013 12:35:39 +0100
Subject: [PATCH] Use MagicWord class to handle the magic word; update
 copyright year.

---
 LinkTitles.body.php       |  5 +++--
 LinkTitles.i18n.magic.php | 10 ++++++++++
 LinkTitles.php            | 14 +++++++-------
 3 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 LinkTitles.i18n.magic.php

diff --git a/LinkTitles.body.php b/LinkTitles.body.php
index 7a11143..1c409d3 100755
--- a/LinkTitles.body.php
+++ b/LinkTitles.body.php
@@ -2,7 +2,7 @@
 /*
  *      \file LinkTitles.body.php
  *      
- *      Copyright 2012 Daniel Kraus <krada@gmx.net>
+ *      Copyright 2012-2013 Daniel Kraus <krada@gmx.net> ('bovender')
  *      
  *      This program is free software; you can redistribute it and/or modify
  *      it under the terms of the GNU General Public License as published by
@@ -75,7 +75,8 @@
 
 			// If the page contains the magic word '__NOAUTOLINKS__', do not parse
 			// the content.
-			if ( strpos( $text, '__NOAUTOLINKS__' ) !== false ) {
+			$mw = MagicWord::get('MAG_LINKTITLES_NOAUTOLINKS');
+			if ( $mw -> matchAndRemove( $text ) ) {
 				return true;
 			}
 
diff --git a/LinkTitles.i18n.magic.php b/LinkTitles.i18n.magic.php
new file mode 100644
index 0000000..4c35011
--- /dev/null
+++ b/LinkTitles.i18n.magic.php
@@ -0,0 +1,10 @@
+<?php
+/*! \file LinkTitles.i18n.magic.php
+ */
+ 
+$magicWords = array();
+
+$magicWords['en'] = array(
+	'MAG_LINKTITLES_NOAUTOLINKS' => '__NOAUTOLINKS__',
+);
+
diff --git a/LinkTitles.php b/LinkTitles.php
index e86c94d..ca735bb 100755
--- a/LinkTitles.php
+++ b/LinkTitles.php
@@ -2,7 +2,7 @@
 /*
  *      \file LinkTitles.php
  *      
- *      Copyright 2012 Daniel Kraus <krada@gmx.net>
+ *      Copyright 2012-2013 Daniel Kraus <krada@gmx.net> ('bovender')
  *      
  *      This program is free software; you can redistribute it and/or modify
  *      it under the terms of the GNU General Public License as published by
@@ -42,20 +42,20 @@
 	$wgLinkTitlesFirstOnly = false;
 	$wgLinkTitlesWordStartOnly = true;
 	$wgLinkTitlesWordEndOnly = true;
-//	$wgLinkTitlesIgnoreCase = true;
 	$wgLinkTitlesSmartMode = true;
 
   $wgExtensionCredits['parserhook'][] = array(
     'path'           => __FILE__,
     'name'           => 'LinkTitles',
-    'author'         => '[http://www.mediawiki.org/wiki/User:Bovender Daniel Kraus]', 
-    'url'            => 'http://www.mediawiki.org/wiki/Extension:LinkTitles',
-    'version'        => '2.0.0',
+    'author'         => '[https://www.mediawiki.org/wiki/User:Bovender Daniel Kraus]', 
+    'url'            => 'https://www.mediawiki.org/wiki/Extension:LinkTitles',
+    'version'        => '2.1.0',
     'descriptionmsg' => 'linktitles-desc'
     );
 
-  $wgExtensionMessagesFiles['LinkTitles'] = dirname( __FILE__ ) . '/LinkTitles.i18n.php';
-  $wgAutoloadClasses['LinkTitles'] = dirname(__FILE__) . '/LinkTitles.body.php';
+  $wgExtensionMessagesFiles['LinkTitles'] = __DIR__ . '/LinkTitles.i18n.php';
+  $wgExtensionMessagesFiles['LinkTitlesMagic'] = __DIR__ . '/LinkTitles.i18n.magic.php';
+  $wgAutoloadClasses['LinkTitles'] = __DIR__ . '/LinkTitles.body.php';
 	$wgExtensionFunctions[] = 'LinkTitles::setup';
 
 	// vim: ts=2:sw=2:noet