Updated currentPageUrl to fix canonical name.

This change allows articles to keep their correct canonical name when using things like search text highlighting in the query string.
This will only work with URL rewriting, and only affects articles.

The purpose of this change is to prevent search engines from seeing duplicated content ( once people do a search, many links suddenly have the same data, but different canonical names ).
Merge pull request #913 from Chris--A/patch-4

Updated currentPageUrl to fix canonical name.