projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enough for today. adding some tags to imap mailbox functions
[squirrelmail.git]
/
src
/
addrbook_search.php
diff --git
a/src/addrbook_search.php
b/src/addrbook_search.php
index f913eca9e83c597ab3e61d46477f696c58b5f6d0..a1c0b7be3b7df331a15a80e058e9d4d3539e9503 100644
(file)
--- a/
src/addrbook_search.php
+++ b/
src/addrbook_search.php
@@
-3,7
+3,7
@@
/**
* addrbook_search.php
*
/**
* addrbook_search.php
*
- * Copyright (c) 1999-200
4
The SquirrelMail Project Team
+ * Copyright (c) 1999-200
5
The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Handle addressbook searching in the popup window.
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Handle addressbook searching in the popup window.
@@
-175,6
+175,10
@@
require_once('../functions/addressbook.php');
displayHtmlHeader();
displayHtmlHeader();
+/** set correct value of $default_charset */
+global $default_charset;
+set_my_charset();
+
/* Initialize vars */
if (!isset($query)) { $query = ''; }
if (!isset($show)) { $show = ''; }
/* Initialize vars */
if (!isset($query)) { $query = ''; }
if (!isset($show)) { $show = ''; }
@@
-201,8
+205,9
@@
if (empty($query) && empty($show) && empty($listall)) {
exit;
}
exit;
}
-/* Initialize addressbook */
-$abook = addressbook_init();
+/* Initialize addressbook, show init errors only in bottom frame */
+$showerr=($show=='form' ? false : true);
+$abook = addressbook_init($showerr);
/* Create search form */
if ($show == 'form' && empty($listall)) {
/* Create search form */
if ($show == 'form' && empty($listall)) {