X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FSiteConfiguration.php;h=f4a4576a5accb087771a8fceb2be87f862ecaefb;hb=c53ccc605f1128eefebda9378116fd18223b1ec2;hp=a6a50a25f7312d6a0bdeb9feb99a2d54383a0fc8;hpb=af184614e55ee88d815e62bf53375753501b0807;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index a6a50a25f7..f4a4576a5a 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -194,10 +194,9 @@ class SiteConfiguration {
 
 	/**
 	 * Retrieves a configuration setting for a given wiki, forced to a boolean.
-	 * @param $settingName String ID of the setting name to retrieve
+	 * @param $setting String ID of the setting name to retrieve
 	 * @param $wiki String Wiki ID of the wiki in question.
 	 * @param $suffix String The suffix of the wiki in question.
-	 * @param $params Array List of parameters. $.'key' is replaced by $value in all returned data.
 	 * @param $wikiTags Array The tags assigned to the wiki.
 	 * @return bool The value of the setting requested.
 	 */
@@ -216,7 +215,7 @@ class SiteConfiguration {
 
 	/**
 	 * Retrieves the value of a given setting, and places it in a variable passed by reference.
-	 * @param $settingName String ID of the setting name to retrieve
+	 * @param $setting String ID of the setting name to retrieve
 	 * @param $wiki String Wiki ID of the wiki in question.
 	 * @param $suffix String The suffix of the wiki in question.
 	 * @param $var Reference The variable to insert the value into.
@@ -232,7 +231,7 @@ class SiteConfiguration {
 
 	/**
 	 * Retrieves the value of a given setting, and places it in its corresponding global variable.
-	 * @param $settingName String ID of the setting name to retrieve
+	 * @param $setting String ID of the setting name to retrieve
 	 * @param $wiki String Wiki ID of the wiki in question.
 	 * @param $suffix String The suffix of the wiki in question.
 	 * @param $params Array List of parameters. $.'key' is replaced by $value in all returned data.
@@ -294,8 +293,9 @@ class SiteConfiguration {
 
 		$ret = call_user_func_array( $this->siteParamsCallback, array( $this, $wiki ) );
 		# Validate the returned value
-		if( !is_array( $ret ) )
+		if( !is_array( $ret ) ) {
 			return $default;
+		}
 
 		foreach( $default as $name => $def ){
 			if( !isset( $ret[$name] ) || ( is_array( $default[$name] ) && !is_array( $ret[$name] ) ) )
@@ -398,7 +398,7 @@ class SiteConfiguration {
 	
 	public function loadFullData() {
 		if ($this->fullLoadCallback && !$this->fullLoadDone) {
-			call_user_func( $this->fullLoadCallback );
+			call_user_func( $this->fullLoadCallback, $this );
 			$this->fullLoadDone = true;
 		}
 	}