Merge "Collapse some unnecessary else conditions"

[lhc/web/wiklou.git] / includes / SiteConfiguration.php

diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 8e77956..1eaedc2 100644 (file)
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -180,7 +180,7 @@ class SiteConfiguration {
         * Retrieves a configuration setting for a given wiki.
         * @param string $settingName ID of the setting name to retrieve
         * @param string $wiki Wiki ID of the wiki in question.
-        * @param string $suffix The suffix of the wiki in question.
+        * @param string|null $suffix The suffix of the wiki in question.
         * @param array $params List of parameters. $.'key' is replaced by $value in all returned data.
         * @param array $wikiTags The tags assigned to the wiki.
         * @return mixed The value of the setting requested.
@@ -294,7 +294,7 @@ class SiteConfiguration {
        /**
         * Gets all settings for a wiki
         * @param string $wiki Wiki ID of the wiki in question.
-        * @param string $suffix The suffix of the wiki in question.
+        * @param string|null $suffix The suffix of the wiki in question.
         * @param array $params List of parameters. $.'key' is replaced by $value in all returned data.
         * @param array $wikiTags The tags assigned to the wiki.
         * @return array Array of settings requested.
@@ -325,7 +325,7 @@ class SiteConfiguration {
         * Retrieves a configuration setting for a given wiki, forced to a boolean.
         * @param string $setting ID of the setting name to retrieve
         * @param string $wiki Wiki ID of the wiki in question.
-        * @param string $suffix The suffix of the wiki in question.
+        * @param string|null $suffix The suffix of the wiki in question.
         * @param array $wikiTags The tags assigned to the wiki.
         * @return bool The value of the setting requested.
         */
@@ -364,7 +364,7 @@ class SiteConfiguration {
         * Retrieves the value of a given setting, and places it in its corresponding global variable.
         * @param string $setting ID of the setting name to retrieve
         * @param string $wiki Wiki ID of the wiki in question.
-        * @param string $suffix The suffix of the wiki in question.
+        * @param string|null $suffix The suffix of the wiki in question.
         * @param array $params List of parameters. $.'key' is replaced by $value in all returned data.
         * @param array $wikiTags The tags assigned to the wiki.
         */
@@ -399,7 +399,7 @@ class SiteConfiguration {
        /**
         * Retrieves the values of all settings, and places them in their corresponding global variables.
         * @param string $wiki Wiki ID of the wiki in question.
-        * @param string $suffix The suffix of the wiki in question.
+        * @param string|null $suffix The suffix of the wiki in question.
         * @param array $params List of parameters. $.'key' is replaced by $value in all returned data.
         * @param array $wikiTags The tags assigned to the wiki.
         */