Link global config array with class props (to be removed)

thomascube

2008-05-15 033478df29d56dcd0a2b521192f0d53845c6b701

Link global config array with class props (to be removed)

 program/include/rcmail.php

@@ -62,14 +62,11 @@
  
  /**
   * Private constructor
   *
   * @todo Remove global $CONFIG
   */
  private function __construct()
  {
    // load configuration
    $this->config = new rcube_config();
    $GLOBALS['CONFIG'] = $this->config->all();
    
    register_shutdown_function(array($this, 'shutdown'));
  }

 program/include/rcube_config.php

@@ -40,6 +40,8 @@

  /**
   * Load config from local config file
   *
   * @todo Remove global $CONFIG
   */
  private function load()
  {
@@ -80,6 +82,9 @@
    
    // clear output buffer
    ob_end_clean();

    // export config data
    $GLOBALS['CONFIG'] = &$this->prop;
  }