Merged revisions 3028-3045 from stable branch.

tbrehm

2012-04-12 02bf997271f4d09e91c8fcb9cecd08f06f2400c4

 interface/lib/app.inc.php

@@ -216,11 +216,14 @@
         $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'].'">');
      } else {
         $this->tpl->setVar('app_logo', '&nbsp;');
      }
      */
      $this->tpl->setVar('app_logo', $this->_conf['logo']);

      $this->tpl->setVar('phpsessid', session_id());