Merge "Add expensive parser functions {{REVISION*:}}"

diff --combined RELEASE-NOTES-1.23
index c9b56b9,711b8a9..1ab3593
--- 1/RELEASE-NOTES-1.23
--- 2/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@@ -18,6 -18,8 +18,8 @@@ production
    This capability can be enabled by setting $wgResourceLoaderStorageEnabled to
    true. This feature is currently considered experimental and should only be
    enabled with care.
+ * (bug 6092) Add expensive parser functions {{REVISIONID:}}, {{REVISIONUSER:}}
+   and {{REVISIONTIMESTAMP:}} (with friends).
  
  === Bug fixes in 1.23 ===
  * (bug 41759) The "updated since last visit" markers (on history pages, recent
@@@ -34,7 -36,6 +36,7 @@@ regularly. Below only new and removed l
  changes to languages because of Bugzilla reports.
  
  === Other changes in 1.23 ===
 +* The global variable $wgArticle has been removed after a lengthy deprecation
  
  == Compatibility ==
  

diff --combined includes/parser/Parser.php
index 6e9e06e,be7fc03..848a1a0
--- 1/includes/parser/Parser.php
--- 2/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@@ -1863,9 -1863,7 +1863,9 @@@ class Parser 
                if ( $useLinkPrefixExtension ) {
                        # Match the end of a line for a word that's not followed by whitespace,
                        # e.g. in the case of 'The Arab al[[Razi]]', 'al' will be matched
 -                      $e2 = wfMessage( 'linkprefix' )->inContentLanguage()->text();
 +                      global $wgContLang;
 +                      $charset = $wgContLang->linkPrefixCharset();
 +                      $e2 = "/^((?>.*[^$charset]|))(.+)$/sDu";
                }
  
                if ( is_null( $this->mTitle ) ) {
@@@ -5762,8 -5760,9 +5762,9 @@@
         * Get the revision object for $this->mRevisionId
         *
         * @return Revision|null either a Revision object or null
+        * @since 1.23 (public since 1.23)
         */
-       protected function getRevisionObject() {
+       public function getRevisionObject() {
                if ( !is_null( $this->mRevisionObject ) ) {
                        return $this->mRevisionObject;
                }