SpecialChangeEmail: error if old email was entered in new email field

[lhc/web/wiklou.git] / languages / classes / LanguageSr.php

diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index 06cb1b5..bdf1ec4 100644 (file)
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -84,8 +84,8 @@ class SrConverter extends LanguageConverter {
         * update: delete all rule parsing because it's not used
         * currently, and just produces a couple of bugs
         *
-        * @param $rule string
-        * @param $flags array
+        * @param string $rule
+        * @param array $flags
         * @return array
         */
        function parseManualRule( $rule, $flags = array() ) {
@@ -108,9 +108,9 @@ class SrConverter extends LanguageConverter {
         *     names as they were
         *   - do not try to find variants for usernames
         *
-        * @param $link string
-        * @param $nt Title
-        * @param $ignoreOtherCond bool
+        * @param string &$link
+        * @param Title &$nt
+        * @param bool $ignoreOtherCond
         */
        function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) {
                // check for user namespace
@@ -128,32 +128,12 @@ class SrConverter extends LanguageConverter {
                }
        }
 
-       /**
-        * An ugly function wrapper for parsing Image titles
-        * (to prevent image name conversion)
-        *
-        * @param $text string
-        * @param $toVariant bool
-        *
-        * @return string
-        */
-       function autoConvert( $text, $toVariant = false ) {
-               global $wgTitle;
-               if ( is_object( $wgTitle ) && $wgTitle->getNamespace() == NS_FILE ) {
-                       $imagename = $wgTitle->getNsText();
-                       if ( preg_match( "/^$imagename:/", $text ) ) {
-                               return $text;
-                       }
-               }
-               return parent::autoConvert( $text, $toVariant );
-       }
-
        /**
         *  It translates text into variant, specials:
         *    - ommiting roman numbers
         *
-        * @param $text string
-        * @param $toVariant string
+        * @param string $text
+        * @param string $toVariant
         *
         * @throws MWException
         * @return string
@@ -192,7 +172,7 @@ class SrConverter extends LanguageConverter {
         *
         * @param string $text The text to be checked
         * @param string $variant Language code of the variant to be checked for
-        * @return bool true if $text appears to be written in $variant
+        * @return bool True if $text appears to be written in $variant
         *
         * @author Nikola Smolenski <smolensk@eunet.rs>
         * @since 1.19