X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSiteConfiguration.php;h=4bbe9e11850007937974b694c612bd9b0aa78f7a;hb=a4ccb6c0940bdde676e9749372e435cb8036b301;hp=6a861d8e885e028bc3353f96eca26e76d34b3d18;hpb=ad3fe84aea912e89dc857439317a26e386ac0912;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 6a861d8e88..4bbe9e1185 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -183,7 +183,7 @@ class SiteConfiguration {
 	 * @param $params Array: array of parameters.
 	 * @return Mixed the value of the setting requested.
 	 */
-	protected function getSetting( $settingName, $wiki, /*array*/ $params ){
+	protected function getSetting( $settingName, $wiki, /*array*/ $params ) {
 		$retval = null;
 		if( array_key_exists( $settingName, $this->settings ) ) {
 			$thisSetting =& $this->settings[$settingName];
@@ -360,9 +360,9 @@ class SiteConfiguration {
 	public function extractGlobalSetting( $setting, $wiki, $params ) {
 		$value = $this->getSetting( $setting, $wiki, $params );
 		if ( !is_null( $value ) ) {
-			if (substr($setting,0,1) == '+' && is_array($value)) {
-				$setting = substr($setting,1);
-				if ( is_array($GLOBALS[$setting]) ) {
+			if ( substr( $setting, 0, 1 ) == '+' && is_array( $value ) ) {
+				$setting = substr( $setting, 1 );
+				if ( is_array( $GLOBALS[$setting] ) ) {
 					$GLOBALS[$setting] = self::arrayMerge( $GLOBALS[$setting], $value );
 				} else {
 					$GLOBALS[$setting] = $value;
@@ -395,7 +395,7 @@ class SiteConfiguration {
 	 * @param $wiki String
 	 * @return array
 	 */
-	protected function getWikiParams( $wiki ){
+	protected function getWikiParams( $wiki ) {
 		static $default = array(
 			'suffix' => null,
 			'lang' => null,
@@ -413,7 +413,7 @@ class SiteConfiguration {
 			return $default;
 		}
 
-		foreach( $default as $name => $def ){
+		foreach( $default as $name => $def ) {
 			if( !isset( $ret[$name] ) || ( is_array( $default[$name] ) && !is_array( $ret[$name] ) ) ) {
 				$ret[$name] = $default[$name];
 			}
@@ -434,7 +434,7 @@ class SiteConfiguration {
 	 * @param $wikiTags Array The tags assigned to the wiki.
 	 * @return array
 	 */
-	protected function mergeParams( $wiki, $suffix, /*array*/ $params, /*array*/ $wikiTags ){
+	protected function mergeParams( $wiki, $suffix, /*array*/ $params, /*array*/ $wikiTags ) {
 		$ret = $this->getWikiParams( $wiki );
 
 		if( is_null( $ret['suffix'] ) ) {
@@ -446,7 +446,7 @@ class SiteConfiguration {
 		$ret['params'] += $params;
 
 		// Automatically fill that ones if needed
-		if( !isset( $ret['params']['lang'] ) && !is_null( $ret['lang'] ) ){
+		if( !isset( $ret['params']['lang'] ) && !is_null( $ret['lang'] ) ) {
 			$ret['params']['lang'] = $ret['lang'];
 		}
 		if( !isset( $ret['params']['site'] ) && !is_null( $ret['suffix'] ) ) {