diff options
| author | Mario <mario@mariovavti.com> | 2021-01-09 19:27:46 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-01-09 19:27:46 +0000 |
| commit | f48d844e4292163da1603e174fabab9c670b8cd2 (patch) | |
| tree | 70b0221f7313f9e621dbee0b37edd5f9ea3ecf79 /include | |
| parent | 898df6287a58e79b957923de4c8ff410586d1397 (diff) | |
| parent | 2522d42c71baee9caba181566948ae4c899885bd (diff) | |
| download | volse-hubzilla-f48d844e4292163da1603e174fabab9c670b8cd2.tar.gz volse-hubzilla-f48d844e4292163da1603e174fabab9c670b8cd2.tar.bz2 volse-hubzilla-f48d844e4292163da1603e174fabab9c670b8cd2.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/help.php | 2 | ||||
| -rw-r--r-- | include/html2plain.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/help.php b/include/help.php index affe64495..ebf1ccc08 100644 --- a/include/help.php +++ b/include/help.php @@ -299,7 +299,7 @@ function load_context_help() { break; array_pop($args); - $path = implode($args,'/'); + $path = implode('/', $args); } return $context_help; diff --git a/include/html2plain.php b/include/html2plain.php index 979354079..fde70bd01 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -40,7 +40,7 @@ function breaklines($line, $level, $wraplength = 75) $newlines[] = $line; - return(implode($newlines, "\n")); + return(implode("\n", $newlines)); } function quotelevel($message, $wraplength = 75) @@ -73,7 +73,7 @@ function quotelevel($message, $wraplength = 75) if (!$startquote or ($line != '')) $newlines[] = breaklines($line, $currlevel, $wraplength); } - return(implode($newlines, "\n")); + return(implode("\n", $newlines)); } function collecturls($message) { |