Merge "rdbms: fix Sqlite::tableExists() method to avoid STATUS_TRX_ERROR"

[lhc/web/wiklou.git] / languages / LanguageConverter.php

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index f611358..ce35717 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -224,7 +224,7 @@ class LanguageConverter {
        /**
         * Get the variant specified in the URL
         *
-        * @return mixed Variant if one found, false otherwise.
+        * @return mixed Variant if one found, null otherwise
         */
        public function getURLVariant() {
                global $wgRequest;
@@ -247,7 +247,7 @@ class LanguageConverter {
        /**
         * Determine if the user has a variant set.
         *
-        * @return mixed Variant if one found, false otherwise.
+        * @return mixed Variant if one found, null otherwise
         */
        protected function getUserVariant() {
                global $wgUser, $wgContLang;
@@ -284,7 +284,7 @@ class LanguageConverter {
        /**
         * Determine the language variant from the Accept-Language header.
         *
-        * @return mixed Variant if one found, false otherwise.
+        * @return mixed Variant if one found, null otherwise
         */
        protected function getHeaderVariant() {
                global $wgRequest;
@@ -967,11 +967,11 @@ class LanguageConverter {
         * Parse the conversion table stored in the cache.
         *
         * The tables should be in blocks of the following form:
-        *              -{
-        *                      word => word ;
-        *                      word => word ;
-        *                      ...
-        *              }-
+        *              -{
+        *                      word => word ;
+        *                      word => word ;
+        *                      ...
+        *              }-
         *
         * To make the tables more manageable, subpages are allowed
         * and will be parsed recursively if $recursive == true.