Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #1498 from dongilbert/ismacfix

Deprecating IS_MAC in favor of IS_UNIX
  • Loading branch information...
commit 585e40cc766f17e2ce57aacfa27bab1bed25d055 2 parents 2aa4739 + c00d1d8
@realityking realityking authored
View
12 libraries/import.legacy.php
@@ -18,15 +18,19 @@
{
define('IS_WIN', ($os === 'WIN') ? true : false);
}
-if (!defined('IS_MAC'))
-{
- define('IS_MAC', ($os === 'MAC') ? true : false);
-}
if (!defined('IS_UNIX'))
{
define('IS_UNIX', (($os !== 'MAC') && ($os !== 'WIN')) ? true : false);
}
+/**
+ * @deprecated 13.3 Use IS_UNIX instead
+ */
+if (!defined('IS_MAC'))
+{
+ define('IS_MAC', (IS_UNIX === true && ($os === 'DAR' || $os === 'MAC')) ? true : false);
+}
+
// Import the platform version library if necessary.
if (!class_exists('JPlatform'))
{
View
6 libraries/import.php
@@ -18,13 +18,9 @@
{
define('IS_WIN', ($os === 'WIN') ? true : false);
}
-if (!defined('IS_MAC'))
-{
- define('IS_MAC', ($os === 'MAC') ? true : false);
-}
if (!defined('IS_UNIX'))
{
- define('IS_UNIX', (($os !== 'MAC') && ($os !== 'WIN')) ? true : false);
+ define('IS_UNIX', (IS_WIN === false) ? true : false);
}
// Import the platform version library if necessary.
View
6 libraries/joomla/client/ftp.php
@@ -121,7 +121,7 @@ class JClientFtp
* @var array
* @since 12.1
*/
- private $_lineEndings = array('UNIX' => "\n", 'MAC' => "\r", 'WIN' => "\r\n");
+ private $_lineEndings = array('UNIX' => "\n", 'WIN' => "\r\n");
/**
* @var array JClientFtp instances container.
@@ -847,10 +847,6 @@ public function read($remote, &$buffer)
{
$os = 'WIN';
}
- elseif (IS_MAC)
- {
- $os = 'MAC';
- }
$buffer = preg_replace("/" . CRLF . "/", $this->_lineEndings[$os], $buffer);
}
Please sign in to comment.
Something went wrong with that request. Please try again.