Avoid warnings; silently pipe http: urls through rcmail::url()

pull/13/head
Thomas Bruederli 13 years ago
parent 688d16e882
commit 88fb563510

@ -726,8 +726,12 @@ class rcmail extends rcube
*/ */
public function url($p) public function url($p)
{ {
if (!is_array($p)) if (!is_array($p)) {
if (strpos($p, 'http') === 0)
return $p;
$p = array('_action' => @func_get_arg(0)); $p = array('_action' => @func_get_arg(0));
}
$task = $p['_task'] ? $p['_task'] : ($p['task'] ? $p['task'] : $this->task); $task = $p['_task'] ? $p['_task'] : ($p['task'] ? $p['task'] : $this->task);
$p['_task'] = $task; $p['_task'] = $task;

@ -422,7 +422,7 @@ abstract class rcube_addressbook
function get_col_values($col, $data, $flat = false) function get_col_values($col, $data, $flat = false)
{ {
$out = array(); $out = array();
foreach ($data as $c => $values) { foreach ((array)$data as $c => $values) {
if ($c === $col || strpos($c, $col.':') === 0) { if ($c === $col || strpos($c, $col.':') === 0) {
if ($flat) { if ($flat) {
$out = array_merge($out, (array)$values); $out = array_merge($out, (array)$values);

Loading…
Cancel
Save