Rewrite: Fix 3 open bugs, repair readme syntax, consistent whitespace usage

CanonURL.i18n.php

@@ -1,19 +1,19 @@
-<?php
-/**
- * Internationalization file for the CanonURL extension.
- *
- * @file CanonURL.i18n.php
- * @ingroup CanonURL
- *
- * @author Jeroen De Dauw
- */
-
-$messages = array();
-
-/** English
- * @author Abhi M Balakrishnan http://www.mediawiki.org/wiki/User:Abhi_M_Balakrishnan
- */
-$messages['en'] = array(
-	'canonurl' => 'CanonURL',
-	'canonurl-desc' => "Adds the canonical links to the head of Mediawiki pages according to [http://support.google.com/webmasters/bin/answer.py?hl=en&answer=139394 Google Canonicalization Content Guidelines]",
-);
+<?php
+/**
+ * Internationalization file for the CanonURL extension.
+ *
+ * @file CanonURL.i18n.php
+ * @ingroup CanonURL
+ *
+ * @author Jeroen De Dauw
+ */
+
+$messages = array();
+
+/** English
+ * @author Abhi M Balakrishnan http://www.mediawiki.org/wiki/User:Abhi_M_Balakrishnan
+ */
+$messages['en'] = array(
+	'canonurl' => 'CanonURL',
+	'canonurl-desc' => "Adds the canonical links to the head of Mediawiki pages according to [http://support.google.com/webmasters/bin/answer.py?hl=en&answer=139394 Google Canonicalization Content Guidelines]",
+);

CanonURL.php

@@ -1,48 +1,42 @@
-<?php 
-
-/**
- * Initialization file for the CanonURL extension.
- *
- * Documentation:	 		http://www.mediawiki.org/wiki/Extension:CanonURL
- * Support					http://www.mediawiki.org/wiki/Extension_talk:CanonURL
- * Source code:             https://github.com/Abhi-M/CanonURL/
- *
- * @file CanonURL.php
- * @ingroup CanonURL
- *
- * @licence GNU GPL v3
- *
- * @author Abhi M Balakrishnan http://www.mediawiki.org/wiki/User:Abhi_M_Balakrishnan
- */ 
-	if ( !defined( 'MEDIAWIKI' ) ) {
-		echo( "This file is an extension to the MediaWiki software and cannot be used standalone.\n" );
-		die( 1 );
-	}
-
-	define( 'CanonURL_VERSION', '0.1' );
-
-	$wgExtensionCredits['other'][] = array(
-		'path' => __FILE__,
-		'name' => 'CanonURL',
-		'version' => CanonURL_VERSION,
-		'author' => array( '[http://www.mediawiki.org/wiki/User:Abhi_M_Balakrishnan Abhi M Balakrishnan]' ),
-		'url' => 'https://mediawiki.org/wiki/Extension:CanonURL',
-		'descriptionmsg' => 'canonurl-desc',
-	);
-
-	$wgExtensionMessagesFiles['CanonURL'] = dirname( __FILE__ ) . '/CanonURL.i18n.php';
-
-	global $wgHooks;
-	$wgHooks['BeforePageDisplay'][]  = 'CanonURL';
-
-	function CanonURL($out)
-	{
-		global $CanonBaseURL;
-		global $wgRequest;
-		$pg_title = urlencode($wgRequest->getVal( 'title' ));
-		$out->addHeadItem( 'canonical',
-		'<link rel="canonical" href="'.$CanonBaseURL.$pg_title.'" />'."\n"
-
-	);	 
-	return true;
+<?php
+
+/**
+ * Initialization file for the CanonURL extension.
+ *
+ * Source code:    https://github.com/Abhi-M/CanonURL
+ * Documentation:  https://www.mediawiki.org/wiki/Extension:CanonURL
+ * Support:        https://github.com/Abhi-M/CanonURL/issues
+ *
+ * @author Abhi M Balakrishnan https://www.mediawiki.org/wiki/User:Abhi_M_Balakrishnan
+ * @license GNU GPL v3
+ * @file
+ * @ingroup Extensions
+ */
+if ( !defined( 'MEDIAWIKI' ) ) {
+	echo( "This file is an extension to the MediaWiki software and cannot be used standalone.\n" );
+	die( 1 );
+}
+
+define( 'CanonURL_VERSION', '0.3.0' );
+
+$wgExtensionCredits['other'][] = array(
+	'path' => __FILE__,
+	'name' => 'CanonURL',
+	'author' => array( '[https://www.mediawiki.org/wiki/User:Abhi_M_Balakrishnan Abhi M Balakrishnan]' ),
+	'version' => CanonURL_VERSION,
+	'url' => 'https://mediawiki.org/wiki/Extension:CanonURL',
+	'descriptionmsg' => 'canonurl-desc',
+);
+
+$wgExtensionMessagesFiles['CanonURL'] = dirname( __FILE__ ) . '/CanonURL.i18n.php';
+
+$wgHooks['BeforePageDisplay'][]  = 'efCanonURL';
+
+/**
+ * @param OutputPage $out
+ * @param Skin $skin
+ */
+function efCanonURL( $out ) {
+	$out->setCanonicalUrl( $out->getTitle()->getCanonicalURL() );
+	return true;
 }

README

@@ -1,26 +1,25 @@
---------------------------------------------------------------------------
-README for the CanonURL extension 0.2
-Licenses: GNU General Public Licence (GPL)
-          GNU Free Documentation License (GFDL)
---------------------------------------------------------------------------
+# CanonURL
+
 Adds the canonical links to the head of Mediawiki pages according to Google Canonicalization Content Guidelines.
-<https://mediawiki.org/wiki/Extension:CanonURL>
-Written by Abhi M Balakrishnan (http://about.me/abhim)
 
-== Prerequisites ==
+<https://www.mediawiki.org/wiki/Extension:CanonURL>
+
+Written by Abhi M Balakrishnan (http://about.me/abhim).
+
+## Prerequisites
 This version of CanonURL requires MediaWiki 1.19 or later.
 
-== Installing ==
-* Copy the CanonURL directory into the extensions folder of your MediaWiki installation.
-* Add following lines to your LocalSettings.php file towards the end:
-	$CanonBaseURL = "http://127.0.0.1/wiki/";
-	require_once("$IP/extensions/CanonURL/CanonURL.php");
+## Installing
+Copy the CanonURL directory into the extensions folder of your MediaWiki installation.
 
-== Verifying the installation ==
-See [[Special:Version]] and confirm the presence of CanonURL under "Installed extensions", "other" category
+## Verifying the installation
+See [[Special:Version]] and confirm the presence of CanonURL under "Installed extensions", "other" category.
 
-== Verifying the configuration ==
-* Clear the cache of your browser
-* Reload any Mediawiki page
-* Check the HTML source and confirm the presence of following line before </head>:
+## Verifying the configuration
+- Clear the cache of your browser
+- Reload any Mediawiki page
+- Check the HTML source and confirm the presence of following line before </head>:
 	<link rel="canonical" href="CANONICAL_URL_OF_CURRENT_PAGE" />
+
+## License
+This extension is licensed under GNU General Public Licence v3.

README.md

@@ -0,0 +1 @@
+README