Fixed: FS#1054 - System Config issues

tbrehm

2010-02-03 4b3b17b57c5cc3be266642caeb6a9a7ea438caf1

 interface/lib/app.inc.php

@@ -175,7 +175,7 @@
         @include_once($filename);
         if(is_array($wb)) {
            if(is_array($this->_wb)) {
               $this->_wb = array_merge($wb,$this->_wb);
               $this->_wb = array_merge($this->_wb,$wb);
            } else {
               $this->_wb = $wb;
            }
@@ -186,7 +186,11 @@
    public function tpl_defaults()
    {   
      $this->tpl->setVar('app_title', $this->_conf['app_title']);
      $this->tpl->setVar('app_version', $this->_conf['app_version']);
      if(isset($_SESSION['s']['user'])) {
         $this->tpl->setVar('app_version', $this->_conf['app_version']);
      } else {
         $this->tpl->setVar('app_version', '');
      }
      $this->tpl->setVar('app_link', $this->_conf['app_link']);
      if(isset($this->_conf['app_logo']) && $this->_conf['app_logo'] != '' && @is_file($this->_conf['app_logo'])){
         $this->tpl->setVar('app_logo', '<img src="'.$this->_conf['app_logo'].'">');