fixes possible search in address book issues

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8891 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 4a5af188c60e7aec466273dbdb601b66a857ef7b..e7947ab79b8ec448e24a9fdceaf87a20d323e419 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -175,6 +175,10 @@ require_once('../functions/addressbook.php');
 
 displayHtmlHeader();
 
+/** set correct value of $default_charset */
+global $default_charset;
+set_my_charset();
+
 /* Initialize vars */
 if (!isset($query)) { $query = ''; }
 if (!isset($show))  { $show  = ''; }

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index e8faf646111a4b7d1016bab100f9c220156f3314..5a6a98340dbbdd56f59bfe8ba836d1f97781ff64 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -173,6 +173,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();