diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2019-11-25 01:28:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-25 01:28:51 +0300 |
| commit | 4d40a3df81f6dc114f7ee324e162fa8d0f5cf686 (patch) | |
| tree | e7f1938394cada2c5e2790ae0e3ee60d1d05d221 /core/SettingsServer.php | |
| parent | ab638844dbbc48548227286e65bbcf6a5e1672ca (diff) | |
Support CliMulti on OS X and print note about whether CliMulti is used in archive output (#15189)
* Support CliMulti on OS X (which does not have procfs).
* Add output note about whether CliMulti is being used.
* fix test
Diffstat (limited to 'core/SettingsServer.php')
| -rw-r--r-- | core/SettingsServer.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/SettingsServer.php b/core/SettingsServer.php index 76cf9b6576..1b35efc8f1 100644 --- a/core/SettingsServer.php +++ b/core/SettingsServer.php @@ -215,4 +215,9 @@ class SettingsServer @ini_set('max_execution_time', $executionTime); @set_time_limit($executionTime); } + + public static function isMac() + { + return defined('PHP_OS') && PHP_OS === 'Darwin'; + } } |