alecpl
2009-04-24 76db10d65d6c21062c39ae867ab6d34f33aca537
- fix setting empty string in imap_root


2 files modified
13 ■■■■■ changed files
program/include/main.inc 5 ●●●●● patch | view | raw | blame | history
program/include/rcmail.php 8 ●●●● patch | view | raw | blame | history
program/include/main.inc
@@ -829,12 +829,13 @@
function console()
  {
  $args = func_get_args();
  if (class_exists('rcmail', false))
      rcmail::get_instance()->plugins->exec_hook('console', $args);
    rcmail::get_instance()->plugins->exec_hook('console', $args);
  $msg = array();
  foreach ($args as $arg)
     $msg[] = !is_string($arg) ? var_export($arg, true) : $arg;
    $msg[] = !is_string($arg) ? var_export($arg, true) : $arg;
  if (!($GLOBALS['CONFIG']['debug_level'] & 4))
    write_log('console', join(";\n", $msg));
program/include/rcmail.php
@@ -371,13 +371,9 @@
    $options = array(
      'imap' => $this->config->get('imap_auth_type', 'check'),
      'delimiter' => isset($_SESSION['imap_delimiter']) ? $_SESSION['imap_delimiter'] : $this->config->get('imap_delimiter'),
      'rootdir' => isset($_SESSION['imap_root']) ? $_SESSION['imap_root'] : $this->config->get('imap_root'),
    );
    if (isset($_SESSION['imap_root']))
      $options['rootdir'] = $_SESSION['imap_root'];
    else if ($imap_root = $this->config->get('imap_root'))
      $options['rootdir'] = $imap_root;
    $this->imap->set_options($options);
  
    // set global object for backward compatibility