You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@shindig.apache.org by li...@apache.org on 2010/04/13 08:19:28 UTC

svn commit: r933487 - /shindig/trunk/php/src/common/Config.php

Author: lindner
Date: Tue Apr 13 06:19:28 2010
New Revision: 933487

URL: http://svn.apache.org/viewvc?rev=933487&view=rev
Log:
SHINDIG-1296 | Patch from Michiel Eghuizen | Add a function setConfig to the Config class

Modified:
    shindig/trunk/php/src/common/Config.php

Modified: shindig/trunk/php/src/common/Config.php
URL: http://svn.apache.org/viewvc/shindig/trunk/php/src/common/Config.php?rev=933487&r1=933486&r2=933487&view=diff
==============================================================================
--- shindig/trunk/php/src/common/Config.php (original)
+++ shindig/trunk/php/src/common/Config.php Tue Apr 13 06:19:28 2010
@@ -43,6 +43,16 @@ class Config {
       }
     }
   }
+  
+  /**
+   * Merges the given array with the config array. It uses the keys/values from config/container.php.
+   */
+  static function setConfig($tconfig) {
+    if (!is_array(self::$config))
+      self::loadConfig();
+    
+    self::$config = array_merge(self::$config, $tconfig);
+  }
 
   static function get($key) {
     if (! self::$config) {