From bf22bc374f4a120ef8c39a1729e000ea5092bf09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 16 Oct 2006 11:56:36 +0000
Subject: [PATCH] Switch to \n on Mac, as it is reported to be common EOL there
 now (bug #1577590).

---
 ChangeLog                | 2 ++
 libraries/common.lib.php | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c6316306..77f7762c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ $HeadURL$
       Documentation.html, index.php, libraries/common.lib.php: Rename left.php
       to navigation.php and modify all calls to that. Only config variables
       are kept as Left*.
+    * libraries/common.lib.php: Switch to \n on Mac, as it is reported to be
+      common EOL there now (bug #1577590).
 
 2006-10-14 Marc Delisle  <lem9@users.sourceforge.net>
     * export.php, db_details_export.php: bug #1541189, views are not displayed
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 7fc3a8483..e17d31c5a 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1174,10 +1174,6 @@ if (!defined('PMA_MINIMUM_COMMON')) {
         if (PMA_USR_OS == 'Win') {
             $the_crlf = "\r\n";
         }
-        // Mac case
-        elseif (PMA_USR_OS == 'Mac') {
-            $the_crlf = "\r";
-        }
         // Others
         else {
             $the_crlf = "\n";