* $wgAjaxSearch has been removed; use $wgEnableMWSuggest instead.

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

diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 0ed7687..9d09109 100644 (file)
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -121,9 +121,18 @@ class SiteConfiguration {
        function getAll( $wiki, $suffix, $params, $wikiTags = array() ) {
                $localSettings = array();
                foreach ( $this->settings as $varname => $stuff ) {
+                       $append = false;
+                       $var = $varname;
+                       if ( substr( $varname, 0, 1 ) == '+' ) {
+                               $append = true;
+                               $var = substr( $varname, 1 );
+                       }
+                       
                        $value = $this->get( $varname, $wiki, $suffix, $params, $wikiTags );
+                       if ( $append && is_array($value) && is_array( $GLOBALS[$var] ) )
+                               $value = array_merge( $value, $GLOBALS[$var] );
                        if ( !is_null( $value ) ) {
-                               $localSettings[$varname] = $value;
+                               $localSettings[$var] = $value;
                        }
                }
                return $localSettings;