Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add flag to specify which line feed to use #3567

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add flag to specify which line feed to use #3567

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d38090
add flag to specify which line feed to use
Hew-ux Dec 21, 2021
445319c
added linefeed as an argument
Hew-ux Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 10 additions & 4 deletions inc/parser/code.php
View file
Open in desktop
Expand Up @@ -25,10 +25,16 @@ public function code($text, $language = null, $filename = '') {
$filename = \dokuwiki\Utf8\Clean::stripspecials($filename, '_');

// send CRLF to Windows clients
if(strpos($INPUT->server->str('HTTP_USER_AGENT'), 'Windows') !== false) {
$text = str_replace("\n", "\r\n", $text);
if(strpos($INPUT->server->str('HTTP_USER_AGENT'), 'Windows') !== false && $linefeed !== "Unix") {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess $linefeed is not defined.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resolved, the function now has the linefeed as an argument and it defaults to ''

if($linefeed && $linefeed !== 'Unix' || !$linefeed) {
$text = str_replace("\n", "\r\n", $text);
}
}

//if($linefeed == "Windows") {
// $text = str_replace("\n", "\r\n", $text);
//}

if($this->_codeblock == $INPUT->str('codeblock')) {
header("Content-Type: text/plain; charset=utf-8");
header("Content-Disposition: attachment; filename=$filename");
Expand All @@ -47,8 +53,8 @@ public function code($text, $language = null, $filename = '') {
* @param string $language
* @param string $filename
*/
public function file($text, $language = null, $filename = '') {
$this->code($text, $language, $filename);
public function file($text, $language = null, $filename = '', $linefeed = '') {
$this->code($text, $language, $filename, $linefeed);
}

/**
Expand Down