thomascube
2008-09-12 cf17773654e1e3f2b09a8aee1058bda4ada3bed1
Fix rcmail::url(), don't use comm_path

1 files modified
20 ■■■■■ changed files
program/include/rcmail.php 20 ●●●●● patch | view | raw | blame | history
program/include/rcmail.php
@@ -892,16 +892,18 @@
    if (!is_array($p))
      $p = array('_action' => @func_get_arg(0));
    
    if ($p['task'] && in_array($p['task'], rcmail::$main_tasks))
      $url = './?_task='.$p['task'];
    else
      $url = $this->comm_path;
    if (!$p['task'] || !in_array($p['task'], rcmail::$main_tasks))
      $p['task'] = $this->task;
    
    unset($p['task']);
    foreach ($p as $par => $val)
      if (isset($val))
        $url .= '&'.urlencode($par).'='.urlencode($val);
    $url = './';
    $delm = '?';
    foreach (array_reverse($p) as $par => $val)
    {
      if (!empty($val)) {
        $url .= $delm.urlencode($par).'='.urlencode($val);
        $delm = '&';
      }
    }
    return $url;
  }
}