From cbb5ed45a4dd04d772ea922b42e3fdc12b744a29 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 17 May 2007 18:41:24 +0000
Subject: Add link to message subjects (#1484257); don't make selected list
 items bold; remove duplicate function

git-svn-id: https://svn.roundcube.net/trunk@567 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/steps/addressbook/func.inc   | 4 ++--
 roundcubemail/program/steps/addressbook/mailto.inc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program/steps/addressbook')

diff --git a/roundcubemail/program/steps/addressbook/func.inc b/roundcubemail/program/steps/addressbook/func.inc
index 5329270c2..397b0a12d 100644
--- a/roundcubemail/program/steps/addressbook/func.inc
+++ b/roundcubemail/program/steps/addressbook/func.inc
@@ -71,7 +71,7 @@ function rcmail_directory_list($attrib)
   $out .= sprintf($line_templ,
     'rcmli'.$local_id,
     !$current ? 'selected' : '',
-    Q(rcmail_self_url('list', array('_source' => 0))),
+    Q(rcmail_url('list', array('_source' => 0))),
     JS_OBJECT_NAME,
     $local_id,
     JS_OBJECT_NAME,
@@ -89,7 +89,7 @@ function rcmail_directory_list($attrib)
     $out .= sprintf($line_templ,
       'rcmli'.$dom_id,
       $current == $id ? 'selected' : '',
-      Q(rcmail_self_url('list', array('_source' => $id))),
+      Q(rcmail_url('list', array('_source' => $id))),
       JS_OBJECT_NAME,
       $js_id,
       JS_OBJECT_NAME,
diff --git a/roundcubemail/program/steps/addressbook/mailto.inc b/roundcubemail/program/steps/addressbook/mailto.inc
index ddbec30d0..27217e5c8 100644
--- a/roundcubemail/program/steps/addressbook/mailto.inc
+++ b/roundcubemail/program/steps/addressbook/mailto.inc
@@ -36,7 +36,7 @@ if (!empty($mailto))
   $mailto_str = join(', ', $mailto);
   $mailto_id = substr(md5($mailto_str), 0, 16);
   $_SESSION['mailto'][$mailto_id] = $mailto_str;
-  $OUTPUT->command('redirect', rcmail_self_url('compose', array('_mailto' => $mailto_id), 'mail'));
+  $OUTPUT->command('redirect', rcmail_url('compose', array('_mailto' => $mailto_id), 'mail'));
 }
 else
   $OUTPUT->show_message('nocontactsfound', 'warning');
-- 
cgit v1.2.3