fix in getPref thnx to Edwin Pranoto

[squirrelmail.git] / src / addrbook_search_html.php

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 4b16fe1e5fa81f156b1f97a00f2e9746fa45f80f..9ee820bd706c3b1d20c7a3b36df43877802ae326 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -94,7 +94,7 @@ function addr_display_result($res, $includesource = true) {
          $line ++;
     }
     echo '<TR><TD ALIGN=center COLSPAN=';
-    if ($includesource) { echo '4'; } else { echo '5'; }
+    if ($includesource) { echo '5'; } else { echo '4'; }
     echo '><INPUT TYPE=submit NAME="addr_search_done" VALUE="' .
          _("Use Addresses") . '"></TD></TR>' .
          '</TABLE>' .
@@ -105,8 +105,12 @@ function addr_display_result($res, $includesource = true) {
 /* --- End functions --- */
 
 global $mailbox;
-displayPageHeader($color, $mailbox);
-
+if ($compose_new_win == '1') {
+    compose_Header($color, $mailbox);
+}
+else {
+    displayPageHeader($color, $mailbox);
+}
 /* Initialize addressbook */
 $abook = addressbook_init();