typo

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

diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index d717129..aa0a6b5 100644 (file)
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -9,20 +9,21 @@ class SiteConfiguration {
        var $localDatabases;
        
        function get( $setting, $wiki, $suffix, $params = array() ) {
-               if ( array_key_exists( $this->settings[$setting], $wiki ) ) {
+               if ( array_key_exists( $wiki, $this->settings[$setting] ) ) {
                        $retval = $this->settings[$setting][$wiki];
-               } elseif ( array_key_exists( $this->settings[$setting], $suffix ) ) {
+               } elseif ( array_key_exists( $suffix, $this->settings[$setting] ) ) {
                        $retval = $this->settings[$setting][$suffix];
-               } elseif ( array_key_exists( $this->settings[$setting], "default" ) ) {
+               } elseif ( array_key_exists( "default", $this->settings[$setting] ) ) {
                        $retval = $this->settings[$setting]['default'];
                } else {
                        $retval = NULL;
                }
                if ( !is_null( $retval ) && count( $params ) ) {
                        foreach ( $params as $key => $value ) {
-                               str_replace( "\${$key}", $value, $retval );
+                               $retval = str_replace( '$' . $key, $value, $retval );
                        }
                }
+               return $retval;
        }
 
        function getBool( $setting, $wiki, $suffix ) {
@@ -39,22 +40,22 @@ class SiteConfiguration {
                }
        }
 
-       function extractVar( $setting, $wiki, $suffix, &$var, &$params ) {
-               $value = $this->get( $settings, $wiki, $suffix, $params );
+       function extractVar( $setting, $wiki, $suffix, &$var, $params ) {
+               $value = $this->get( $setting, $wiki, $suffix, $params );
                if ( !is_null( $value ) ) {
                        $var = $value;
                }
        }
        
-       function extractGlobal( $setting, $wiki, $suffix, &$params ) {
-               $value = $this->get( $settings, $wiki, $suffix, $params );
+       function extractGlobal( $setting, $wiki, $suffix, $params ) {
+               $value = $this->get( $setting, $wiki, $suffix, $params );
                if ( !is_null( $value ) ) {
                        $GLOBALS[$setting] = $value;
                }
        }
 
-       function extractAllGlobals( $wiki, $suffix, &$params ) {
-               foreach ( $settings as $varName => $setting ) {
+       function extractAllGlobals( $wiki, $suffix, $params ) {
+               foreach ( $this->settings as $varName => $setting ) {
                        $this->extractGlobal( $varName, $wiki, $suffix, $params );
                }
        }