I have rolled back Stefan's additions.

This is the equivalent to rev 1.143.
Yes, this is stepping on Stefan's toes a little, but we didn't want a CVS snapshot made with new featuration added. Sorry Stefan, please feel free to commit new feature code once we branch 1.5.0.

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

diff --git a/functions/page_header.php b/functions/page_header.php
index 568053be4c7ace8553f0785486f6f1a442cd16aa..00c26d4f2f728365ebd698d5f539b67a0830dc3b 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -238,11 +238,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
         displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right');
     } 
     echo "  \n";
-    if (getPref($data_dir, $username,"vcard")==1)  {
-      displayInternalLink ('src/addressbook_vcard.php', _("Addresses"), 'right');
-    } else {
     displayInternalLink ('src/addressbook.php', _("Addresses"), 'right');
-    }
     echo "  \n";
     displayInternalLink ('src/folders.php', _("Folders"), 'right');
     echo "  \n";