Put back old 1.5.1 functionality after the rest of magicHtml was synced

[squirrelmail.git] / src / addrbook_search_html.php

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index d64e8b52a932c56206db0342d8b2b7a8abc448d5..f8118364c81d9dbf765a90497c52c1d310740a01 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -3,7 +3,7 @@
 /**
  * addrbook_search_html.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Handle addressbook searching with pure html.
@@ -157,7 +157,9 @@ if ($javascript_on) {
     echo html_tag( 'tr',
                 html_tag( 'td',
                         '<input type="submit" name="addr_search_done" value="' .
-                        _("Use Addresses") . '" />' ,
+                        _("Use Addresses") . '" /> ' .
+                        '<input type="submit" name="addr_search_cancel" value="' .
+                        _("Cancel") . '" />',
                 'center', '', 'colspan="'. $td_colspan .'"' )
             ) .
          '</table>' .
@@ -173,6 +175,11 @@ if ($compose_new_win == '1') {
 else {
     displayPageHeader($color, $mailbox);
 }
+
+/** set correct value of $default_charset */
+global $default_charset;
+set_my_charset();
+
 /* Initialize addressbook */
 $abook = addressbook_init();