Merge "Revert "Fix link prefix/suffixes around Category and Language links.""

[lhc/web/wiklou.git] / includes / parser / Parser.php

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 3261002..988e248 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -736,17 +736,6 @@ class Parser {
                return $text;
        }
 
-       /**
-        * Get a random string
-        *
-        * @return string
-        * @deprecated since 1.26; use wfRandomString() instead.
-        */
-       public static function getRandomString() {
-               wfDeprecated( __METHOD__, '1.26' );
-               return wfRandomString( 16 );
-       }
-
        /**
         * Set the current user.
         * Should only be used when doing pre-save transform.
@@ -757,17 +746,6 @@ class Parser {
                $this->mUser = $user;
        }
 
-       /**
-        * Accessor for mUniqPrefix.
-        *
-        * @return string
-        * @deprecated since 1.26; use Parser::MARKER_PREFIX instead.
-        */
-       public function uniqPrefix() {
-               wfDeprecated( __METHOD__, '1.26' );
-               return self::MARKER_PREFIX;
-       }
-
        /**
         * Set the context title
         *
@@ -973,14 +951,9 @@ class Parser {
         * @param array $elements List of element names. Comments are always extracted.
         * @param string $text Source text string.
         * @param array &$matches Out parameter, Array: extracted tags
-        * @param string|null $uniq_prefix
         * @return string Stripped text
-        * @since 1.26 The uniq_prefix argument is deprecated.
         */
-       public static function extractTagsAndParams( $elements, $text, &$matches, $uniq_prefix = null ) {
-               if ( $uniq_prefix !== null ) {
-                       wfDeprecated( __METHOD__ . ' called with $prefix argument', '1.26' );
-               }
+       public static function extractTagsAndParams( $elements, $text, &$matches ) {
                static $n = 1;
                $stripped = '';
                $matches = [];
@@ -2611,7 +2584,7 @@ class Parser {
                                ) ) );
                                break;
                        case 'talkpagename':
-                               if ( $this->mTitle->canTalk() ) {
+                               if ( $this->mTitle->canHaveTalkPage() ) {
                                        $talkPage = $this->mTitle->getTalkPage();
                                        $value = wfEscapeWikiText( $talkPage->getPrefixedText() );
                                } else {
@@ -2619,7 +2592,7 @@ class Parser {
                                }
                                break;
                        case 'talkpagenamee':
-                               if ( $this->mTitle->canTalk() ) {
+                               if ( $this->mTitle->canHaveTalkPage() ) {
                                        $talkPage = $this->mTitle->getTalkPage();
                                        $value = wfEscapeWikiText( $talkPage->getPrefixedURL() );
                                } else {
@@ -2719,12 +2692,12 @@ class Parser {
                                $value = $this->mTitle->getNamespace();
                                break;
                        case 'talkspace':
-                               $value = $this->mTitle->canTalk()
+                               $value = $this->mTitle->canHaveTalkPage()
                                        ? str_replace( '_', ' ', $this->mTitle->getTalkNsText() )
                                        : '';
                                break;
                        case 'talkspacee':
-                               $value = $this->mTitle->canTalk() ? wfUrlencode( $this->mTitle->getTalkNsText() ) : '';
+                               $value = $this->mTitle->canHaveTalkPage() ? wfUrlencode( $this->mTitle->getTalkNsText() ) : '';
                                break;
                        case 'subjectspace':
                                $value = str_replace( '_', ' ', $this->mTitle->getSubjectNsText() );