aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2016-01-18 00:28:21 +0100
committerVirtualTam <virtualtam@flibidi.net>2016-01-18 00:28:21 +0100
commitdc7db03feb92904fe1bed087cdf01c75edf0f68f (patch)
treeda930d531d73d29a771fc6bde51b2279053fdf9f
parent122d90ef8d83c6702a8b47f81c32fa3ba7a53c31 (diff)
parentaa7f7b3ea66e0155960765d1213c632dafa74918 (diff)
downloadShaarli-dc7db03feb92904fe1bed087cdf01c75edf0f68f.tar.gz
Shaarli-dc7db03feb92904fe1bed087cdf01c75edf0f68f.tar.zst
Shaarli-dc7db03feb92904fe1bed087cdf01c75edf0f68f.zip
Merge pull request #443 from virtualtam/fix/logm-eol
fix: use PHP_EOL for carriage returns in file logs
-rw-r--r--application/Utils.php2
-rw-r--r--tests/UtilsTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/application/Utils.php b/application/Utils.php
index cb30595f..551db3e7 100644
--- a/application/Utils.php
+++ b/application/Utils.php
@@ -16,7 +16,7 @@ function logm($logFile, $clientIp, $message)
16{ 16{
17 file_put_contents( 17 file_put_contents(
18 $logFile, 18 $logFile,
19 date('Y/m/d H:i:s').' - '.$clientIp.' - '.strval($message).'\n', 19 date('Y/m/d H:i:s').' - '.$clientIp.' - '.strval($message).PHP_EOL,
20 FILE_APPEND 20 FILE_APPEND
21 ); 21 );
22} 22}
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
index f3bb556e..3073b5eb 100644
--- a/tests/UtilsTest.php
+++ b/tests/UtilsTest.php
@@ -51,7 +51,7 @@ class UtilsTest extends PHPUnit_Framework_TestCase
51 protected function getLastLogEntry() 51 protected function getLastLogEntry()
52 { 52 {
53 $logFile = file(self::$testLogFile); 53 $logFile = file(self::$testLogFile);
54 return explode(' - ', trim(array_pop($logFile), '\n')); 54 return explode(' - ', trim(array_pop($logFile), PHP_EOL));
55 } 55 }
56 56
57 /** 57 /**